diff options
Diffstat (limited to 'libkdepim')
80 files changed, 462 insertions, 462 deletions
diff --git a/libkdepim/addresseeemailselection.cpp b/libkdepim/addresseeemailselection.cpp index f5d840c9..f9f10160 100644 --- a/libkdepim/addresseeemailselection.cpp +++ b/libkdepim/addresseeemailselection.cpp @@ -150,7 +150,7 @@ bool AddresseeEmailSelection::itemMatches( const KABC::Addressee &addressee, uin bool AddresseeEmailSelection::itemEquals( const KABC::Addressee &addressee, uint index, const TQString &pattern ) const { return (pattern == addressee.formattedName() + " " + email( addressee, index )) || - (addressee.emails().contains( pattern )); + (addressee.emails().tqcontains( pattern )); } TQString AddresseeEmailSelection::distributionListText( const KABC::DistributionList *distributionList ) const diff --git a/libkdepim/addresseelineedit.cpp b/libkdepim/addresseelineedit.cpp index 5e3d0cf3..243b6608 100644 --- a/libkdepim/addresseelineedit.cpp +++ b/libkdepim/addresseelineedit.cpp @@ -217,12 +217,12 @@ void AddresseeLineEdit::keyPressEvent( TQKeyEvent *e ) { bool accept = false; - if ( KStdAccel::shortcut( KStdAccel::SubstringCompletion ).contains( KKey( e ) ) ) { + if ( KStdAccel::shortcut( KStdAccel::SubstringCompletion ).tqcontains( KKey( e ) ) ) { //TODO: add LDAP substring lookup, when it becomes available in KPIM::LDAPSearch updateSearchString(); doCompletion( true ); accept = true; - } else if ( KStdAccel::shortcut( KStdAccel::TextCompletion ).contains( KKey( e ) ) ) { + } else if ( KStdAccel::shortcut( KStdAccel::TextCompletion ).tqcontains( KKey( e ) ) ) { int len = text().length(); if ( len == cursorPosition() ) { // at End? @@ -287,11 +287,11 @@ void AddresseeLineEdit::insert( const TQString &t ) } else if ( newText.find(" at ") != -1 ) { // Anti-spam stuff - newText.replace( " at ", "@" ); - newText.replace( " dot ", "." ); + newText.tqreplace( " at ", "@" ); + newText.tqreplace( " dot ", "." ); } else if ( newText.find("(at)") != -1 ) { - newText.replace( TQRegExp("\\s*\\(at\\)\\s*"), "@" ); + newText.tqreplace( TQRegExp("\\s*\\(at\\)\\s*"), "@" ); } TQString contents = text(); @@ -388,8 +388,8 @@ void AddresseeLineEdit::dropEvent( TQDropEvent *e ) return; } } else { - // Let's see if this drop contains a comma separated list of emails - TQString dropData = TQString::fromUtf8( e->encodedData( "text/plain" ) ); + // Let's see if this drop tqcontains a comma separated list of emails + TQString dropData = TQString::fromUtf8( e->tqencodedData( "text/plain" ) ); TQStringList addrs = splitEmailAddrList( dropData ); if ( addrs.count() > 0 ) { setText( normalizeAddressesAndDecodeIDNs( dropData ) ); @@ -698,7 +698,7 @@ void AddresseeLineEdit::addContact( const KABC::Addressee& addr, int weight, int * We remove the <blank> in getAdjustedCompletionItems. */ if ( isPrefEmail == prefEmailWeight ) - fullEmail.replace( " <", " <" ); + fullEmail.tqreplace( " <", " <" ); addCompletionItem( fullEmail, weight + isPrefEmail, source, &keyWords ); isPrefEmail = 0; @@ -821,7 +821,7 @@ void AddresseeLineEdit::slotLDAPSearchData( const KPIM::LdapResultList& adrs ) addr.setNameFromString( (*it).name ); addr.setEmails( (*it).email ); - if ( !s_ldapClientToCompletionSourceMap->contains( (*it).clientNumber ) ) + if ( !s_ldapClientToCompletionSourceMap->tqcontains( (*it).clientNumber ) ) updateLDAPWeights(); // we got results from a new source, so update the completion sources addContact( addr, (*it).completionWeight, (*s_ldapClientToCompletionSourceMap)[ (*it ).clientNumber ] ); @@ -852,7 +852,7 @@ void AddresseeLineEdit::setCompletedItems( const TQStringList& items, bool autoS TQPoint oldPosOfItemUnderMouse; if ( itemUnderMouse ) { oldTextUnderMouse = itemUnderMouse->text(); - oldPosOfItemUnderMouse = completionBox->itemRect( itemUnderMouse ).topLeft(); + oldPosOfItemUnderMouse = completionBox->tqitemRect( itemUnderMouse ).topLeft(); } completionBox->setItems( items ); @@ -865,7 +865,7 @@ void AddresseeLineEdit::setCompletedItems( const TQStringList& items, bool autoS // calls show(), and that's where KCompletionBox installs its filter. // We want to be first, though, so do it now. if ( s_completion->order() == KCompletion::Weighted ) - qApp->installEventFilter( this ); + tqApp->installEventFilter( this ); } // Try to re-select what was selected before, otherrwise use the first @@ -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->itemRect( newItemUnderMouse ); + TQRect r = completionBox->tqitemRect( newItemUnderMouse ); TQPoint target = r.topLeft(); if ( oldPosOfItemUnderMouse != target ) { target.setX( target.x() + r.width()/2 ); @@ -1243,7 +1243,7 @@ const TQStringList KPIM::AddresseeLineEdit::getAdjustedCompletionItems( bool ful } (*it) = (*it).prepend( s_completionItemIndentString ); // remove preferred email sort <blank> added in addContact() - (*it).replace( " <", " <" ); + (*it).tqreplace( " <", " <" ); } sections[idx].append( *it ); diff --git a/libkdepim/addresseeselector.cpp b/libkdepim/addresseeselector.cpp index 5bd73b5d..65e34985 100644 --- a/libkdepim/addresseeselector.cpp +++ b/libkdepim/addresseeselector.cpp @@ -47,7 +47,7 @@ class AddresseeSelector::AddressBookManager void addAddressBook( const TQString &title, SelectionItem::List &list ); void clear(); - bool contains( uint index, const SelectionItem& ); + bool tqcontains( uint index, const SelectionItem& ); private: struct AddressBookEntry { @@ -101,7 +101,7 @@ void AddresseeSelector::AddressBookManager::clear() mAddressBooks.clear(); } -bool AddresseeSelector::AddressBookManager::contains( uint index, const SelectionItem &item ) +bool AddresseeSelector::AddressBookManager::tqcontains( uint index, const SelectionItem &item ) { if ( index == 0 ) // the 'all' entry return true; @@ -267,7 +267,7 @@ void AddresseeSelector::init() void AddresseeSelector::initGUI() { - TQGridLayout *layout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), KDialog::spacingHint() ); + TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), KDialog::spacingHint() ); TQGridLayout *topLayout = new TQGridLayout( this, 2, 2, KDialog::marginHint() ); TQLabel *label = new TQLabel( i18n( "Address book:" ), this ); @@ -284,7 +284,7 @@ void AddresseeSelector::initGUI() topLayout->setColStretch( 1, 1 ); - layout->addMultiCellLayout( topLayout, 0, 0, 0, 2 ); + tqlayout->addMultiCellLayout( topLayout, 0, 0, 0, 2 ); int row = 1; @@ -303,8 +303,8 @@ void AddresseeSelector::initGUI() mRemoveMapper->setMapping( listView, i ); TQVBoxLayout *buttonLayout = new TQVBoxLayout( this ); - buttonLayout->setAlignment( Qt::AlignBottom ); - layout->addLayout( buttonLayout, row, 1 ); + buttonLayout->tqsetAlignment( Qt::AlignBottom ); + tqlayout->addLayout( buttonLayout, row, 1 ); // move button TQToolButton *moveButton = new TQToolButton( this ); @@ -327,7 +327,7 @@ void AddresseeSelector::initGUI() buttonLayout->addWidget( moveButton ); buttonLayout->addWidget( removeButton ); - layout->addWidget( listView, row, 2 ); + tqlayout->addWidget( listView, row, 2 ); } mAddresseeView = new KListView( this ); @@ -335,7 +335,7 @@ void AddresseeSelector::initGUI() mAddresseeView->header()->hide(); mAddresseeView->setFullWidth( true ); - layout->addMultiCellWidget( mAddresseeView, 1, row, 0, 0 ); + tqlayout->addMultiCellWidget( mAddresseeView, 1, row, 0, 0 ); } void AddresseeSelector::finish() @@ -362,7 +362,7 @@ void AddresseeSelector::updateAddresseeView() SelectionItem::List::Iterator it; for ( it = mSelectionItems.begin(); it != mSelectionItems.end(); ++it ) { - if ( mAddressBookManager->contains( addressBookIndex, *it ) ) { + if ( mAddressBookManager->tqcontains( addressBookIndex, *it ) ) { if ( (*it).distributionList() == 0 ) { if ( mAddresseeFilter->text().isEmpty() || mSelection->itemMatches( (*it).addressee(), (*it).index(), @@ -565,9 +565,9 @@ AddresseeSelectorDialog::AddresseeSelectorDialog( Selection *selection, : KDialogBase( Plain, "", Ok | Cancel, Ok, parent, name, true ) { TQFrame *frame = plainPage(); - TQVBoxLayout *layout = new TQVBoxLayout( frame ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( frame ); mSelector = new KPIM::AddresseeSelector( selection, frame ); - layout->addWidget( mSelector ); + tqlayout->addWidget( mSelector ); resize( 500, 490 ); } diff --git a/libkdepim/addresseeview.cpp b/libkdepim/addresseeview.cpp index 89033482..d5b3e6e2 100644 --- a/libkdepim/addresseeview.cpp +++ b/libkdepim/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::fromLatin1( + TQString cellStyle = TQString::tqfromLatin1( "style=\"" "padding-right: 2px; " "border-right: #000 dashed 1px; " "background: %1;\"").arg(backgroundColor); TQString backgroundColor2 = KGlobalSettings::baseColor().name(); - TQString cellStyle2 = TQString::fromLatin1( + TQString cellStyle2 = TQString::tqfromLatin1( "style=\"" "padding-left: 2px; " "background: %1;\"").arg(backgroundColor2); - TQString tableStyle = TQString::fromLatin1( + TQString tableStyle = TQString::tqfromLatin1( "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::fromLatin1( + TQString rowFmtStr = TQString::tqfromLatin1( "<tr>" "<td align=\"right\" valign=\"top\" width=\"30%\" "); // Tag unclosed rowFmtStr.append( cellStyle ); - rowFmtStr.append( TQString::fromLatin1( + rowFmtStr.append( TQString::tqfromLatin1( ">" // Close tag "<b>%1</b>" "</td>" "<td align=\"left\" valign=\"top\" width=\"70%\" ") ); // Tag unclosed rowFmtStr.append( cellStyle2 ); - rowFmtStr.append( TQString::fromLatin1( + rowFmtStr.append( TQString::tqfromLatin1( ">" // 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::fromLatin1( "fax:" ) + number; + url = TQString::tqfromLatin1( "fax:" ) + number; else - url = TQString::fromLatin1( "phone:" ) + number; + url = TQString::tqfromLatin1( "phone:" ) + number; if ( linkMask & PhoneLinks ) { TQString smsURL; @@ -238,11 +238,11 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr smsURL = TQString(" (<a href=\"sms:%1\">%2</a>)" ).arg( number ).arg( i18n( "SMS") ); dynamicPart += rowFmtStr - .arg( (*phoneIt).typeLabel().replace( " ", " " ) ) - .arg( TQString::fromLatin1( "<a href=\"%1\">%2</a>%3" ).arg( url ).arg( number ).arg( smsURL ) ); + .arg( (*phoneIt).typeLabel().tqreplace( " ", " " ) ) + .arg( TQString::tqfromLatin1( "<a href=\"%1\">%2</a>%3" ).arg( url ).arg( number ).arg( smsURL ) ); } else { dynamicPart += rowFmtStr - .arg( (*phoneIt).typeLabel().replace( " ", " " ) ) + .arg( (*phoneIt).typeLabel().tqreplace( " ", " " ) ) .arg( number ); } } @@ -258,7 +258,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr if ( linkMask & EmailLinks ) { dynamicPart += rowFmtStr.arg( type ) - .arg( TQString::fromLatin1( "<a href=\"mailto:%1\">%2</a>" ) + .arg( TQString::tqfromLatin1( "<a href=\"mailto:%1\">%2</a>" ) .arg( fullEmail, TQStyleSheet::escape( *emailIt ) ) ); } else { dynamicPart += rowFmtStr.arg( type ).arg( *emailIt ); @@ -296,7 +296,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr TQString formattedAddress; formattedAddress = TQStyleSheet::escape( (*addrIt).formattedAddress().stripWhiteSpace() ); - formattedAddress = formattedAddress.replace( '\n', "<br>" ); + formattedAddress = formattedAddress.tqreplace( '\n', "<br>" ); TQString link = "<a href=\"addr:" + (*addrIt).id() + "\">" + formattedAddress + "</a>"; @@ -312,7 +312,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr } } else { TQString link = "<a href=\"addr:" + (*addrIt).id() + "\">" + - (*addrIt).label().replace( '\n', "<br>" ) + "</a>"; + (*addrIt).label().tqreplace( '\n', "<br>" ) + "</a>"; if ( linkMask & AddressLinks ) { dynamicPart += rowFmtStr @@ -321,7 +321,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr } else { dynamicPart += rowFmtStr .arg( KABC::Address::typeLabel( (*addrIt).type() ) ) - .arg( (*addrIt).label().replace( '\n', "<br>" ) ); + .arg( (*addrIt).label().tqreplace( '\n', "<br>" ) ); } } } @@ -333,7 +333,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr // the data afterwards (keeps us safe from possible % signs // in either one). notes = TQStyleSheet::escape( addr.note() ); - notes = rowFmtStr.arg( i18n( "Notes" ) ).arg( notes.replace( '\n', "<br>" ) ) ; + notes = rowFmtStr.arg( i18n( "Notes" ) ).arg( notes.tqreplace( '\n', "<br>" ) ) ; } TQString customData; @@ -393,7 +393,7 @@ 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::fromLatin1( "im_status_%1_image").arg( addr.uid() ); + imgSrc = TQString::tqfromLatin1( "im_status_%1_image").arg( addr.uid() ); TQMimeSourceFactory::defaultFactory()->setPixmap( imgSrc, proxy->presenceIcon( addr.uid() ) ); } else imgSrc = pixmapAsDataUrl( proxy->presenceIcon( addr.uid() ) ); @@ -401,9 +401,9 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr // make the status a link, if required TQString imStatus; if ( linkMask & IMLinks ) - imStatus = TQString::fromLatin1( "<a href=\"im:\"><img src=\"%1\"> (%2)</a>" ); + imStatus = TQString::tqfromLatin1( "<a href=\"im:\"><img src=\"%1\"> (%2)</a>" ); else - imStatus = TQString::fromLatin1( "<img src=\"%1\"> (%2)" ); + imStatus = TQString::tqfromLatin1( "<img src=\"%1\"> (%2)" ); // append our status to the rest of the dynamic part of the addressee dynamicPart += rowFmtStr @@ -419,53 +419,53 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr // @STYLE@ - construct the string by parts, substituting in // the styles first. There are lots of appends, but we need to // do it this way to avoid cases where the substituted string - // contains %1 and the like. + // tqcontains %1 and the like. // - TQString strAddr = TQString::fromLatin1( + TQString strAddr = TQString::tqfromLatin1( "<div align=\"center\">" "<table cellpadding=\"1\" cellspacing=\"0\" %1>" "<tr>").arg(tableStyle); - strAddr.append( TQString::fromLatin1( + strAddr.append( TQString::tqfromLatin1( "<td align=\"right\" valign=\"top\" width=\"30%\" rowspan=\"3\" %2>") .arg( cellStyle ) ); - strAddr.append( TQString::fromLatin1( + strAddr.append( TQString::tqfromLatin1( "<img src=\"%1\" width=\"50\" vspace=\"1\">" // image "</td>") .arg( image ) ); - strAddr.append( TQString::fromLatin1( + strAddr.append( TQString::tqfromLatin1( "<td align=\"left\" width=\"70%\" %2>") .arg( cellStyle2 ) ); - strAddr.append( TQString::fromLatin1( + strAddr.append( TQString::tqfromLatin1( "<font size=\"+2\"><b>%2</b></font></td>" // name "</tr>") .arg( name ) ); - strAddr.append( TQString::fromLatin1( + strAddr.append( TQString::tqfromLatin1( "<tr>" "<td align=\"left\" width=\"70%\" %2>") .arg( cellStyle2 ) ); - strAddr.append( TQString::fromLatin1( + strAddr.append( TQString::tqfromLatin1( "%3</td>" // role "</tr>") .arg( role ) ); - strAddr.append( TQString::fromLatin1( + strAddr.append( TQString::tqfromLatin1( "<tr>" "<td align=\"left\" width=\"70%\" %2>") .arg( cellStyle2 ) ); - strAddr.append( TQString::fromLatin1( + strAddr.append( TQString::tqfromLatin1( "%4</td>" // organization "</tr>") .arg( organization ) ); - strAddr.append( TQString::fromLatin1( + strAddr.append( TQString::tqfromLatin1( "<tr><td %2>") .arg( cellStyle ) ); - strAddr.append( TQString::fromLatin1( + strAddr.append( TQString::tqfromLatin1( " </td><td %2> </td></tr>") .arg( cellStyle2 ) ); strAddr.append( dynamicPart ); strAddr.append( notes ); strAddr.append( customData ); - strAddr.append( TQString::fromLatin1( "</table></div>\n" ) ); + strAddr.append( TQString::tqfromLatin1( "</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::fromLatin1( + strAddr = TQString::tqfromLatin1( "<html>" "<body text=\"%1\" bgcolor=\"%2\">" // text and background color "%3" // dynamic part @@ -591,7 +591,7 @@ void AddresseeView::phoneNumberClicked( const TQString &number ) return; } - commandLine.replace( "%N", number ); + commandLine.tqreplace( "%N", number ); KRun::runCommand( commandLine ); } @@ -623,8 +623,8 @@ void AddresseeView::sendSMS( const TQString &number, const TQString &text ) *stream << text; file.close(); - commandLine.replace( "%N", number ); - commandLine.replace( "%F", file.name() ); + commandLine.tqreplace( "%N", number ); + commandLine.tqreplace( "%F", file.name() ); KRun::runCommand( commandLine ); } @@ -640,7 +640,7 @@ void AddresseeView::faxNumberClicked( const TQString &number ) return; } - commandLine.replace( "%N", number ); + commandLine.tqreplace( "%N", number ); KRun::runCommand( commandLine ); } diff --git a/libkdepim/addresseeview.h b/libkdepim/addresseeview.h index ae7281b5..74c3a657 100644 --- a/libkdepim/addresseeview.h +++ b/libkdepim/addresseeview.h @@ -84,7 +84,7 @@ class KDE_EXPORT AddresseeView : public KTextBrowser /** Sets which parts of the contact shall be presented as links. - The mask can be OR'ed LinkMask. By default all links are enabled. + The tqmask can be OR'ed LinkMask. By default all links are enabled. */ void enableLinks( int linkMask ); @@ -114,7 +114,7 @@ class KDE_EXPORT AddresseeView : public KTextBrowser </div> @param addr The addressee object. - @param linkMask The mask for which parts of the contact will + @param linkMask The tqmask for which parts of the contact will be displayed as links. The links looks like this: "addr://<addr id>" for addresses @@ -124,7 +124,7 @@ class KDE_EXPORT AddresseeView : public KTextBrowser "im:<im addrss>" for instant messaging addresses "sms://<phone number>" for sending a sms @param internalLoading If true, the loading of internal pictures is done automatically. - @param fieldMask The mask for which fields of the contact will + @param fieldMask The tqmask for which fields of the contact will be displayed. */ static TQString vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *proxy, LinkMask linkMask = DefaultLinks, diff --git a/libkdepim/addressesdialog.cpp b/libkdepim/addressesdialog.cpp index 14feafb6..5807b0d6 100644 --- a/libkdepim/addressesdialog.cpp +++ b/libkdepim/addressesdialog.cpp @@ -176,7 +176,7 @@ AddresseeViewItem::email() const bool AddresseeViewItem::matches(const TQString& txt) const { - return d->address.realName().contains(txt, false) || d->address.preferredEmail().contains(txt, false); + return d->address.realName().tqcontains(txt, false) || d->address.preferredEmail().tqcontains(txt, false); } void AddresseeViewItem::setSelected(bool selected) @@ -1043,11 +1043,11 @@ AddressesDialog::filterChanged( const TQString& txt ) } p2 = static_cast<AddresseeViewItem*>( p2->nextSibling() ); } - if ( !pcount && !p->text( 0 ).contains( txt, false ) ) { + if ( !pcount && !p->text( 0 ).tqcontains( txt, false ) ) { p->setVisible( false ); } distlistgroupVisible += pcount; - if ( p->text( 0 ).contains( txt, false ) ) { + if ( p->text( 0 ).tqcontains( txt, false ) ) { distlistgroupVisible++; } } diff --git a/libkdepim/addresspicker.ui b/libkdepim/addresspicker.ui index f6e9b784..e0bf7a9a 100644 --- a/libkdepim/addresspicker.ui +++ b/libkdepim/addresspicker.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>AddressPickerUI</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -66,7 +66,7 @@ </widget> <widget class="QLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <vbox> <property name="name"> @@ -82,7 +82,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -132,7 +132,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -160,7 +160,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -181,7 +181,7 @@ <property name="text"> <string>&Selected Addresses</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignCenter</set> </property> <property name="buddy" stdset="0"> @@ -200,7 +200,7 @@ <property name="text"> <string>&Address Book</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignCenter</set> </property> <property name="buddy" stdset="0"> @@ -209,7 +209,7 @@ </widget> <widget class="QLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -315,7 +315,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/libkdepim/broadcaststatus.cpp b/libkdepim/broadcaststatus.cpp index b566bd4b..fb48f05c 100644 --- a/libkdepim/broadcaststatus.cpp +++ b/libkdepim/broadcaststatus.cpp @@ -23,46 +23,46 @@ #include "broadcaststatus.h" #include "progressmanager.h" -KPIM::BroadcastStatus* KPIM::BroadcastStatus::instance_ = 0; -static KStaticDeleter<KPIM::BroadcastStatus> broadcastStatusDeleter; +KPIM::BroadcasStatus* KPIM::BroadcasStatus::instance_ = 0; +static KStaticDeleter<KPIM::BroadcasStatus> broadcasStatusDeleter; namespace KPIM { -BroadcastStatus* BroadcastStatus::instance() +BroadcasStatus* BroadcasStatus::instance() { if (!instance_) - broadcastStatusDeleter.setObject( instance_, new BroadcastStatus() ); + broadcasStatusDeleter.setObject( instance_, new BroadcasStatus() ); return instance_; } -BroadcastStatus::BroadcastStatus() +BroadcasStatus::BroadcasStatus() :mTransientActive( false ) { } -BroadcastStatus::~BroadcastStatus() +BroadcasStatus::~BroadcasStatus() { instance_ = 0; } -void BroadcastStatus::setStatusMsg( const TQString& message ) +void BroadcasStatus::seStatusMsg( const TQString& message ) { mStatusMsg = message; if( !mTransientActive ) emit statusMsg( message ); } -void BroadcastStatus::setStatusMsgWithTimestamp( const TQString& message ) +void BroadcasStatus::seStatusMsgWithTimestamp( const TQString& message ) { KLocale* locale = KGlobal::locale(); - setStatusMsg( i18n( "%1 is a time, %2 is a status message", "[%1] %2" ) + seStatusMsg( i18n( "%1 is a time, %2 is a status message", "[%1] %2" ) .arg( locale->formatTime( TQTime::currentTime(), true /* with seconds */ ) ) .arg( message ) ); } -void BroadcastStatus::setStatusMsgTransmissionCompleted( int numMessages, +void BroadcasStatus::seStatusMsgTransmissionCompleted( int numMessages, int numBytes, int numBytesRead, int numBytesToRead, @@ -94,12 +94,12 @@ void BroadcastStatus::setStatusMsgTransmissionCompleted( int numMessages, else statusMsg = i18n( "Transmission complete. No new messages." ); - setStatusMsgWithTimestamp( statusMsg ); + seStatusMsgWithTimestamp( statusMsg ); if ( item ) - item->setStatus( statusMsg ); + item->seStatus( statusMsg ); } -void BroadcastStatus::setStatusMsgTransmissionCompleted( const TQString& account, +void BroadcasStatus::seStatusMsgTransmissionCompleted( const TQString& account, int numMessages, int numBytes, int numBytesRead, @@ -142,18 +142,18 @@ void BroadcastStatus::setStatusMsgTransmissionCompleted( const TQString& account statusMsg = i18n( "Transmission for account %1 complete. No new messages.") .arg( account ); - setStatusMsgWithTimestamp( statusMsg ); + seStatusMsgWithTimestamp( statusMsg ); if ( item ) - item->setStatus( statusMsg ); + item->seStatus( statusMsg ); } -void BroadcastStatus::setTransientStatusMsg( const TQString& msg ) +void BroadcasStatus::setTransienStatusMsg( const TQString& msg ) { mTransientActive = true; emit statusMsg( msg ); } -void BroadcastStatus::reset() +void BroadcasStatus::reset() { mTransientActive = false; // restore diff --git a/libkdepim/broadcaststatus.h b/libkdepim/broadcaststatus.h index ad5c11bc..11eacd3e 100644 --- a/libkdepim/broadcaststatus.h +++ b/libkdepim/broadcaststatus.h @@ -29,29 +29,29 @@ class ProgressItem; */ -class KDE_EXPORT BroadcastStatus : public QObject +class KDE_EXPORT BroadcasStatus : public QObject { Q_OBJECT public: - virtual ~BroadcastStatus(); + virtual ~BroadcasStatus(); /** Return the instance of the singleton object for this class */ - static BroadcastStatus *instance(); + static BroadcasStatus *instance(); - /** Return the last status message from setStatusMsg() */ + /** Return the last status message from seStatusMsg() */ TQString statusMsg() const { return mStatusMsg; } /** Sets a status bar message with timestamp */ - void setStatusMsgWithTimestamp( const TQString& message ); + void seStatusMsgWithTimestamp( const TQString& message ); /** Sets a transmission completed status bar message */ - void setStatusMsgTransmissionCompleted( int numMessages, + void seStatusMsgTransmissionCompleted( int numMessages, int numBytes = -1, int numBytesRead = -1, int numBytesToRead = -1, bool mLeaveOnServer = false, KPIM::ProgressItem* progressItem = 0 ); // set the same status in this progress item - void setStatusMsgTransmissionCompleted( const TQString& account, + void seStatusMsgTransmissionCompleted( const TQString& account, int numMessages, int numBytes = -1, int numBytesRead = -1, @@ -62,13 +62,13 @@ public: public slots: /** Emit an update status bar signal. It's a slot so it can be hooked up to other signals. */ - void setStatusMsg( const TQString& message ); + void seStatusMsg( const TQString& message ); /** Set a status message that will go away again with the next call of reset(). */ - void setTransientStatusMsg( const TQString& msg ); + void setTransienStatusMsg( const TQString& msg ); /** Reset the status message to what ever non-transient message was last active or has since been set. @@ -77,15 +77,15 @@ public slots: signals: - /** Emitted when setStatusMsg is called. */ + /** Emitted when seStatusMsg is called. */ void statusMsg( const TQString& ); protected: - BroadcastStatus(); + BroadcasStatus(); TQString mStatusMsg; bool mTransientActive; - static BroadcastStatus* instance_; + static BroadcasStatus* instance_; }; diff --git a/libkdepim/categoryeditdialog.cpp b/libkdepim/categoryeditdialog.cpp index 719bd920..d386ae10 100644 --- a/libkdepim/categoryeditdialog.cpp +++ b/libkdepim/categoryeditdialog.cpp @@ -66,23 +66,23 @@ CategoryEditDialog::CategoryEditDialog( KPimPrefs *prefs, TQWidget* parent, TQWidget *widget = new TQWidget( this ); setMainWidget( widget ); - TQGridLayout *layout = new TQGridLayout( widget, 4, 2, marginHint(), spacingHint() ); + TQGridLayout *tqlayout = new TQGridLayout( widget, 4, 2, marginHint(), spacingHint() ); d->mView = new TQListView( widget ); d->mView->addColumn( "" ); d->mView->header()->hide(); d->mView->setDefaultRenameAction( TQListView::Accept ); - layout->addMultiCellWidget( d->mView, 0, 3, 0, 0 ); + tqlayout->addMultiCellWidget( d->mView, 0, 3, 0, 0 ); d->mAddButton = new TQPushButton( i18n( "Add" ), widget ); - layout->addWidget( d->mAddButton, 0, 1 ); + tqlayout->addWidget( d->mAddButton, 0, 1 ); d->mEditButton = new TQPushButton( i18n( "Edit" ), widget ); - layout->addWidget( d->mEditButton, 1, 1 ); + tqlayout->addWidget( d->mEditButton, 1, 1 ); d->mDeleteButton = new TQPushButton( i18n( "Remove" ), widget ); - layout->addWidget( d->mDeleteButton, 2, 1 ); + tqlayout->addWidget( d->mDeleteButton, 2, 1 ); fillList(); diff --git a/libkdepim/categoryeditdialog_base.ui b/libkdepim/categoryeditdialog_base.ui index 21a9faf2..b23a6697 100644 --- a/libkdepim/categoryeditdialog_base.ui +++ b/libkdepim/categoryeditdialog_base.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>CategoryEditDialog_base</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -54,7 +54,7 @@ </widget> <widget class="QLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>layout103</cstring> + <cstring>tqlayout103</cstring> </property> <vbox> <property name="name"> @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -103,5 +103,5 @@ <tabstop>mButtonAdd</tabstop> <tabstop>mButtonRemove</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/libkdepim/categoryselectdialog_base.ui b/libkdepim/categoryselectdialog_base.ui index 713efbbf..c5030679 100644 --- a/libkdepim/categoryselectdialog_base.ui +++ b/libkdepim/categoryselectdialog_base.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>CategorySelectDialog_base</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -73,7 +73,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -97,5 +97,5 @@ <tabstop>mButtonClear</tabstop> <tabstop>mButtonEdit</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/libkdepim/cfgc/general_base.ui b/libkdepim/cfgc/general_base.ui index fda2fc23..040990ef 100644 --- a/libkdepim/cfgc/general_base.ui +++ b/libkdepim/cfgc/general_base.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>GeneralBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -42,5 +42,5 @@ </widget> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/libkdepim/cfgc/myoptions_base.ui b/libkdepim/cfgc/myoptions_base.ui index 60207f9e..fe5d43ac 100644 --- a/libkdepim/cfgc/myoptions_base.ui +++ b/libkdepim/cfgc/myoptions_base.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>MyOptionsBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -16,7 +16,7 @@ <property name="name"> <cstring>textLabel1</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>30</x> <y>180</y> @@ -32,7 +32,7 @@ <property name="name"> <cstring>MyString</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>130</x> <y>180</y> @@ -42,5 +42,5 @@ </property> </widget> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/libkdepim/clicklineedit.cpp b/libkdepim/clicklineedit.cpp index dfe7cbad..98748e44 100644 --- a/libkdepim/clicklineedit.cpp +++ b/libkdepim/clicklineedit.cpp @@ -39,13 +39,13 @@ ClickLineEdit::~ClickLineEdit() {} void ClickLineEdit::setClickMessage( const TQString &msg ) { mClickMessage = msg; - repaint(); + tqrepaint(); } void ClickLineEdit::setText( const TQString &txt ) { mDrawClickMsg = txt.isEmpty(); - repaint(); + tqrepaint(); KLineEdit::setText( txt ); } @@ -67,7 +67,7 @@ void ClickLineEdit::focusInEvent( TQFocusEvent *ev ) if ( mDrawClickMsg == true ) { mDrawClickMsg = false; - repaint(); + tqrepaint(); } TQLineEdit::focusInEvent( ev ); } @@ -77,7 +77,7 @@ void ClickLineEdit::focusOutEvent( TQFocusEvent *ev ) if ( text().isEmpty() ) { mDrawClickMsg = true; - repaint(); + tqrepaint(); } TQLineEdit::focusOutEvent( ev ); } diff --git a/libkdepim/clicklineedit.h b/libkdepim/clicklineedit.h index 0eb4c7a8..65357375 100644 --- a/libkdepim/clicklineedit.h +++ b/libkdepim/clicklineedit.h @@ -27,7 +27,7 @@ namespace KPIM { /** - This class provides a KLineEdit which contains a greyed-out hinting + This class provides a KLineEdit which tqcontains a greyed-out hinting text as long as the user didn't enter any text @short LineEdit with customizable "Click here" text diff --git a/libkdepim/csshelper.cpp b/libkdepim/csshelper.cpp index 6b37fbf1..4116e583 100644 --- a/libkdepim/csshelper.cpp +++ b/libkdepim/csshelper.cpp @@ -328,7 +328,7 @@ namespace KPIM { if ( mQuoteFont[i].bold() ) quoteCSS += " font-weight: bold ! important;\n"; if ( mShrinkQuotes ) - quoteCSS += " font-size: " + TQString::fromLatin1( quoteFontSizes[i] ) + quoteCSS += " font-size: " + TQString::tqfromLatin1( quoteFontSizes[i] ) + "% ! important;\n"; quoteCSS += "}\n\n"; } diff --git a/libkdepim/designerfields.cpp b/libkdepim/designerfields.cpp index ba78df0e..5569c258 100644 --- a/libkdepim/designerfields.cpp +++ b/libkdepim/designerfields.cpp @@ -50,7 +50,7 @@ DesignerFields::DesignerFields( const TQString &uiFile, TQWidget *parent, void DesignerFields::initGUI( const TQString &uiFile ) { - TQVBoxLayout *layout = new TQVBoxLayout( this ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); TQWidget *wdg = TQWidgetFactory::create( uiFile, 0, this ); if ( !wdg ) { @@ -61,7 +61,7 @@ void DesignerFields::initGUI( const TQString &uiFile ) mTitle = wdg->caption(); mIdentifier = wdg->name(); - layout->addWidget( wdg ); + tqlayout->addWidget( wdg ); TQObjectList *list = wdg->queryList( "TQWidget" ); TQObjectListIt it( *list ); @@ -78,7 +78,7 @@ void DesignerFields::initGUI( const TQString &uiFile ) << "KDatePicker"; while ( it.current() ) { - if ( allowedTypes.contains( it.current()->className() ) ) { + if ( allowedTypes.tqcontains( it.current()->className() ) ) { TQString name = it.current()->name(); if ( name.startsWith( "X_" ) ) { name = name.mid( 2 ); @@ -154,13 +154,13 @@ void DesignerFields::load( DesignerFields::Storage *storage ) wdg->setChecked( false ); } else if ( widIt.data()->inherits( "QDateTimeEdit" ) ) { QDateTimeEdit *wdg = static_cast<QDateTimeEdit*>( widIt.data() ); - wdg->setDateTime( TQDateTime::currentDateTime() ); + wdg->setDateTime( TQDateTime::tqcurrentDateTime() ); } else if ( widIt.data()->inherits( "KDateTimeWidget" ) ) { KDateTimeWidget *wdg = static_cast<KDateTimeWidget*>( widIt.data() ); - wdg->setDateTime( TQDateTime::currentDateTime() ); + wdg->setDateTime( TQDateTime::tqcurrentDateTime() ); } else if ( widIt.data()->inherits( "KDatePicker" ) ) { KDatePicker *wdg = static_cast<KDatePicker*>( widIt.data() ); - wdg->setDate( TQDate::currentDate() ); + wdg->setDate( TQDate::tqcurrentDate() ); } else if ( widIt.data()->inherits( "TQComboBox" ) ) { TQComboBox *wdg = static_cast<TQComboBox*>( widIt.data() ); wdg->setCurrentItem( 0 ); diff --git a/libkdepim/distributionlist.cpp b/libkdepim/distributionlist.cpp index 2ccdeb52..6d96b235 100644 --- a/libkdepim/distributionlist.cpp +++ b/libkdepim/distributionlist.cpp @@ -63,7 +63,7 @@ void KPIM::DistributionList::insertEntry( const TQString& uid, const TQString& e TQString str = custom( "KADDRESSBOOK", s_customFieldName ); // Assumption: UIDs don't contain ; nor , str += ";" + uid + "," + email; - insertCustom( "KADDRESSBOOK", s_customFieldName, str ); // replace old value + insertCustom( "KADDRESSBOOK", s_customFieldName, str ); // tqreplace old value } void KPIM::DistributionList::removeEntry( const Addressee& addr, const TQString& email ) @@ -88,7 +88,7 @@ void KPIM::DistributionList::removeEntry( const TQString& uid, const TQString& e } if ( str.isEmpty() ) str = ";"; // keep something, for isDistributionList to work - insertCustom( "KADDRESSBOOK", s_customFieldName, str ); // replace old value + insertCustom( "KADDRESSBOOK", s_customFieldName, str ); // tqreplace old value } bool KPIM::DistributionList::isDistributionList( const KABC::Addressee& addr ) @@ -131,15 +131,15 @@ KPIM::DistributionList KPIM::DistributionList::findByName( KABC::AddressBook* bo return DistributionList(); } -static KABC::Addressee findByUidOrName( KABC::AddressBook* book, const TQString& uidOrName, const TQString& email ) +static KABC::Addressee tqfindByUidOrName( KABC::AddressBook* book, const TQString& uidOrName, const TQString& email ) { - KABC::Addressee a = book->findByUid( uidOrName ); + KABC::Addressee a = book->tqfindByUid( uidOrName ); if ( a.isEmpty() ) { // UID not found, maybe it is a name instead. // If we have an email, let's use that for the lookup. // [This is used by e.g. the Kolab resource] if ( !email.isEmpty() ) { - KABC::Addressee::List lst = book->findByEmail( email ); + KABC::Addressee::List lst = book->tqfindByEmail( email ); KABC::Addressee::List::ConstIterator listit = lst.begin(); for ( ; listit != lst.end(); ++listit ) if ( (*listit).formattedName() == uidOrName ) { @@ -170,7 +170,7 @@ KPIM::DistributionList::Entry::List KPIM::DistributionList::entries( KABC::Addre const TQString uid = (*it).first; const TQString email = (*it).second; // look up contact - KABC::Addressee a = findByUidOrName( book, uid, email ); + KABC::Addressee a = tqfindByUidOrName( book, uid, email ); if ( a.isEmpty() ) { // ## The old DistributionListManager had a "missing entries" list... kdWarning() << "Addressee not found: " << uid << endl; @@ -192,7 +192,7 @@ TQStringList KPIM::DistributionList::emails( KABC::AddressBook* book ) const const TQString thisEmail = (*it).second; // look up contact - KABC::Addressee a = findByUidOrName( book, thisUid, thisEmail ); + KABC::Addressee a = tqfindByUidOrName( book, thisUid, thisEmail ); if ( a.isEmpty() ) { // ## The old DistributionListManager had a "missing entries" list... continue; diff --git a/libkdepim/embeddedurlpage.cpp b/libkdepim/embeddedurlpage.cpp index d0120574..12b25ded 100644 --- a/libkdepim/embeddedurlpage.cpp +++ b/libkdepim/embeddedurlpage.cpp @@ -41,8 +41,8 @@ EmbeddedURLPage::EmbeddedURLPage( const TQString &url, const TQString &mimetype, void EmbeddedURLPage::initGUI( const TQString &url, const TQString &/*mimetype*/ ) { - TQVBoxLayout *layout = new TQVBoxLayout( this ); - layout->setAutoAdd( true ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + tqlayout->setAutoAdd( true ); new TQLabel( i18n("Showing URL %1").arg( url ), this ); } diff --git a/libkdepim/kabcresourcecached.cpp b/libkdepim/kabcresourcecached.cpp index d46156f6..beeb7b90 100644 --- a/libkdepim/kabcresourcecached.cpp +++ b/libkdepim/kabcresourcecached.cpp @@ -165,8 +165,8 @@ void ResourceCached::slotKABCSave() void ResourceCached::insertAddressee( const Addressee &addr ) { - if ( !mAddrMap.contains( addr.uid() ) ) { // new contact - if ( mDeletedAddressees.contains( addr.uid() ) ) { + if ( !mAddrMap.tqcontains( addr.uid() ) ) { // new contact + if ( mDeletedAddressees.tqcontains( addr.uid() ) ) { // it was first removed, then added, so it's an update... mDeletedAddressees.remove( addr.uid() ); @@ -189,7 +189,7 @@ void ResourceCached::insertAddressee( const Addressee &addr ) void ResourceCached::removeAddressee( const Addressee &addr ) { - if ( mAddedAddressees.contains( addr.uid() ) ) { + if ( mAddedAddressees.tqcontains( addr.uid() ) ) { mAddedAddressees.remove( addr.uid() ); return; } diff --git a/libkdepim/kaddrbook.cpp b/libkdepim/kaddrbook.cpp index e5ef47e6..187ce637 100644 --- a/libkdepim/kaddrbook.cpp +++ b/libkdepim/kaddrbook.cpp @@ -56,7 +56,7 @@ void KAddrBookExternal::openEmail( const TQString &addr, TQWidget *parent ) { } #endif - KABC::Addressee::List addressees = ab->findByEmail( email ); + KABC::Addressee::List addressees = ab->tqfindByEmail( email ); if ( addressees.count() > 0 ) { if ( kapp->dcopClient()->isApplicationRegistered( "kaddressbook" ) ){ @@ -109,7 +109,7 @@ void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *parent) { } #endif - KABC::Addressee::List addressees = ab->findByEmail( email ); + KABC::Addressee::List addressees = ab->tqfindByEmail( email ); if ( addressees.isEmpty() ) { KABC::Addressee a; @@ -181,7 +181,7 @@ bool KAddrBookExternal::addVCard( const KABC::Addressee& addressee, TQWidget *pa ab->setErrorHandler( new KABC::GuiErrorHandler( parent ) ); KABC::Addressee::List addressees = - ab->findByEmail( addressee.preferredEmail() ); + ab->tqfindByEmail( addressee.preferredEmail() ); if ( addressees.isEmpty() ) { if ( KAddrBookExternal::addAddressee( addressee ) ) { diff --git a/libkdepim/kcmdesignerfields.cpp b/libkdepim/kcmdesignerfields.cpp index 330d8b84..15935693 100644 --- a/libkdepim/kcmdesignerfields.cpp +++ b/libkdepim/kcmdesignerfields.cpp @@ -261,7 +261,7 @@ void KCMDesignerFields::defaults() void KCMDesignerFields::initGUI() { - TQVBoxLayout *layout = new TQVBoxLayout( this, KDialog::marginHint(), + TQVBoxLayout *tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); bool noDesigner = KStandardDirs::findExe("designer").isEmpty(); @@ -272,10 +272,10 @@ void KCMDesignerFields::initGUI() i18n("<qt><b>Warning:</b> Qt Designer could not be found. It is probably not " "installed. You will only be able to import existing designer files.</qt>"); TQLabel *lbl = new TQLabel( txt, this ); - layout->addWidget( lbl ); + tqlayout->addWidget( lbl ); } - TQHBoxLayout *hbox = new TQHBoxLayout( layout, KDialog::spacingHint() ); + TQHBoxLayout *hbox = new TQHBoxLayout( tqlayout, KDialog::spacingHint() ); mPageView = new KListView( this ); mPageView->addColumn( i18n( "Available Pages" ) ); @@ -295,7 +295,7 @@ void KCMDesignerFields::initGUI() loadUiFiles(); - hbox = new TQHBoxLayout( layout, KDialog::spacingHint() ); + hbox = new TQHBoxLayout( tqlayout, KDialog::spacingHint() ); TQString cwHowto = i18n("<qt><p>This section allows you to add your own GUI" " Elements ('<i>Widgets</i>') to store your own values" @@ -323,7 +323,7 @@ void KCMDesignerFields::initGUI() hbox->addWidget( activeLabel ); // ### why is this needed? Looks like a KActiveLabel bug... - activeLabel->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Maximum ); + activeLabel->tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Maximum ); hbox->addStretch( 1 ); @@ -361,7 +361,7 @@ void KCMDesignerFields::updatePreview( TQListViewItem *item ) "<tr><td align=\"right\"><b>%7</b></td><td>%8</td></tr>" "</table></qt>" ) .arg( i18n( "Key:" ) ) - .arg( item->text( 0 ).replace("X_","X-") ) + .arg( item->text( 0 ).tqreplace("X_","X-") ) .arg( i18n( "Type:" ) ) .arg( item->text( 1 ) ) .arg( i18n( "Classname:" ) ) diff --git a/libkdepim/kdateedit.cpp b/libkdepim/kdateedit.cpp index 1791d4da..c4221556 100644 --- a/libkdepim/kdateedit.cpp +++ b/libkdepim/kdateedit.cpp @@ -49,7 +49,7 @@ class DateValidator : public QValidator if ( length <= 0 ) return Intermediate; - if ( mKeywords.contains( str.lower() ) ) + if ( mKeywords.tqcontains( str.lower() ) ) return Acceptable; bool ok = false; @@ -72,13 +72,13 @@ KDateEdit::KDateEdit( TQWidget *parent, const char *name ) // need at least one entry for popup to work setMaxCount( 1 ); - mDate = TQDate::currentDate(); + mDate = TQDate::tqcurrentDate(); TQString today = KGlobal::locale()->formatDate( mDate, true ); insertItem( today ); setCurrentItem( 0 ); changeItem( today, 0 ); - setMinimumSize( sizeHint() ); + setMinimumSize( tqsizeHint() ); 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->sizeHint().height(); + int dateFrameHeight = mPopup->tqsizeHint().height(); if ( popupPoint.y() + height() + dateFrameHeight > desk.bottom() ) popupPoint.setY( popupPoint.y() - dateFrameHeight ); else popupPoint.setY( popupPoint.y() + height() ); - int dateFrameWidth = mPopup->sizeHint().width(); + int dateFrameWidth = mPopup->tqsizeHint().width(); if ( popupPoint.x() + dateFrameWidth > desk.right() ) popupPoint.setX( desk.right() - dateFrameWidth ); @@ -157,13 +157,13 @@ void KDateEdit::popup() if ( mDate.isValid() ) mPopup->setDate( mDate ); else - mPopup->setDate( TQDate::currentDate() ); + mPopup->setDate( TQDate::tqcurrentDate() ); mPopup->popup( popupPoint ); // The combo box is now shown pressed. Make it show not pressed again // by causing its (invisible) list box to emit a 'selected' signal. - // First, ensure that the list box contains the date currently displayed. + // First, ensure that the list box tqcontains the date currently displayed. TQDate date = parseDate(); assignDate( date ); updateView(); @@ -191,12 +191,12 @@ void KDateEdit::dateSelected( TQDate date ) void KDateEdit::lineEnterPressed() { - bool replaced = false; + bool tqreplaced = false; - TQDate date = parseDate( &replaced ); + TQDate date = parseDate( &tqreplaced ); if (assignDate( date ) ) { - if ( replaced ) + if ( tqreplaced ) updateView(); emit dateChanged( date ); @@ -204,18 +204,18 @@ void KDateEdit::lineEnterPressed() } } -TQDate KDateEdit::parseDate( bool *replaced ) const +TQDate KDateEdit::parseDate( bool *tqreplaced ) const { TQString text = currentText(); TQDate result; - if ( replaced ) - (*replaced) = false; + if ( tqreplaced ) + (*tqreplaced) = false; if ( text.isEmpty() ) result = TQDate(); - else if ( mKeywordMap.contains( text.lower() ) ) { - TQDate today = TQDate::currentDate(); + else if ( mKeywordMap.tqcontains( text.lower() ) ) { + TQDate today = TQDate::tqcurrentDate(); int i = mKeywordMap[ text.lower() ]; if ( i >= 100 ) { /* A day name has been entered. Convert to offset from today. @@ -235,8 +235,8 @@ TQDate KDateEdit::parseDate( bool *replaced ) const } result = today.addDays( i ); - if ( replaced ) - (*replaced) = true; + if ( tqreplaced ) + (*tqreplaced) = true; } else { result = KGlobal::locale()->readDate( text ); } @@ -286,7 +286,7 @@ bool KDateEdit::eventFilter( TQObject *object, TQEvent *event ) case TQEvent::MouseButtonDblClick: case TQEvent::MouseButtonPress: { TQMouseEvent *mouseEvent = (TQMouseEvent*)event; - if ( !mPopup->rect().contains( mouseEvent->pos() ) ) { + if ( !mPopup->rect().tqcontains( mouseEvent->pos() ) ) { TQPoint globalPos = mPopup->mapToGlobal( mouseEvent->pos() ); if ( TQApplication::widgetAt( globalPos, true ) == this ) { // The date picker is being closed by a click on the diff --git a/libkdepim/kdateedit.h b/libkdepim/kdateedit.h index 819ce933..0adb6ee5 100644 --- a/libkdepim/kdateedit.h +++ b/libkdepim/kdateedit.h @@ -36,7 +36,7 @@ class TQEvent; /** A date editing widget that consists of an editable combo box. - The combo box contains the date in text form, and clicking the combo + The combo box tqcontains the date in text form, and clicking the combo box arrow will display a 'popup' style date picker. This widget also supports advanced features like allowing the user diff --git a/libkdepim/kdatepickerpopup.cpp b/libkdepim/kdatepickerpopup.cpp index 2e28dd83..8e3f3695 100644 --- a/libkdepim/kdatepickerpopup.cpp +++ b/libkdepim/kdatepickerpopup.cpp @@ -97,12 +97,12 @@ void KDatePickerPopup::slotDateChanged( TQDate date ) void KDatePickerPopup::slotToday() { - emit dateChanged( TQDate::currentDate() ); + emit dateChanged( TQDate::tqcurrentDate() ); } void KDatePickerPopup::slotTomorrow() { - emit dateChanged( TQDate::currentDate().addDays( 1 ) ); + emit dateChanged( TQDate::tqcurrentDate().addDays( 1 ) ); } void KDatePickerPopup::slotNoDate() @@ -112,12 +112,12 @@ void KDatePickerPopup::slotNoDate() void KDatePickerPopup::slotNextWeek() { - emit dateChanged( TQDate::currentDate().addDays( 7 ) ); + emit dateChanged( TQDate::tqcurrentDate().addDays( 7 ) ); } void KDatePickerPopup::slotNextMonth() { - emit dateChanged( TQDate::currentDate().addMonths( 1 ) ); + emit dateChanged( TQDate::tqcurrentDate().addMonths( 1 ) ); } #include "kdatepickerpopup.moc" diff --git a/libkdepim/kdatepickerpopup.h b/libkdepim/kdatepickerpopup.h index 080bf498..70ed6793 100644 --- a/libkdepim/kdatepickerpopup.h +++ b/libkdepim/kdatepickerpopup.h @@ -56,7 +56,7 @@ class KDE_EXPORT KDatePickerPopup: public QPopupMenu @param parent The object's parent. @param name The object's name. */ - KDatePickerPopup( int items = DatePicker, const TQDate &date = TQDate::currentDate(), + KDatePickerPopup( int items = DatePicker, const TQDate &date = TQDate::tqcurrentDate(), TQWidget *parent = 0, const char *name = 0 ); /** diff --git a/libkdepim/kfileio.cpp b/libkdepim/kfileio.cpp index 4d49c114..6a7eea7c 100644 --- a/libkdepim/kfileio.cpp +++ b/libkdepim/kfileio.cpp @@ -190,7 +190,7 @@ KDE_EXPORT bool kBytesToFile(const char* aBuffer, int len, if (aAskIfExists) { TQString str; - str = i18n("File %1 exists.\nDo you want to replace it?") + str = i18n("File %1 exists.\nDo you want to tqreplace it?") .arg(aFileName); rc = KMessageBox::warningContinueCancel(0, str, i18n("Save to File"), i18n("&Replace")); diff --git a/libkdepim/kfileio.h b/libkdepim/kfileio.h index 91552888..99d4d1dc 100644 --- a/libkdepim/kfileio.h +++ b/libkdepim/kfileio.h @@ -17,7 +17,7 @@ class TQString; namespace KPIM { -/** Load a file. Returns a pointer to the memory-block that contains +/** Load a file. Returns a pointer to the memory-block that tqcontains * the loaded file. Returns a null string if the file could not be loaded. * If withDialogs is FALSE no warning dialogs are opened if there are * problems. diff --git a/libkdepim/kfoldertree.cpp b/libkdepim/kfoldertree.cpp index 5e263673..2bf6ca1b 100644 --- a/libkdepim/kfoldertree.cpp +++ b/libkdepim/kfoldertree.cpp @@ -118,7 +118,7 @@ int KFolderTreeItem::compare( TQListViewItem * i, int col, bool ) const else { // sort by unread or total-column - Q_INT64 a = 0, b = 0; + TQ_INT64 a = 0, b = 0; if (col == static_cast<KFolderTree*>(listView())->unreadIndex()) { a = mUnread; @@ -181,7 +181,7 @@ void KFolderTreeItem::setTotalCount( int aTotal ) } //----------------------------------------------------------------------------- -void KFolderTreeItem::setFolderSize( Q_INT64 aSize ) +void KFolderTreeItem::setFolderSize( TQ_INT64 aSize ) { if ( aSize < 0 ) return; // we need to update even if nothing changed, kids ... @@ -195,10 +195,10 @@ void KFolderTreeItem::setFolderSize( Q_INT64 aSize ) size = KIO::convertSize(mSize); } if ( childCount() > 0 && !isOpen() ) { - Q_INT64 recursiveSize = recursiveFolderSize(); + TQ_INT64 recursiveSize = recursiveFolderSize(); if ( recursiveSize != mSize ) { if ( mType != Root ) - size += TQString::fromLatin1(" + %1").arg( KIO::convertSize( recursiveSize - mSize ) ); + size += TQString::tqfromLatin1(" + %1").arg( KIO::convertSize( recursiveSize - mSize ) ); else size = KIO::convertSize( recursiveSize ); } @@ -209,9 +209,9 @@ void KFolderTreeItem::setFolderSize( Q_INT64 aSize ) } //----------------------------------------------------------------------------- -Q_INT64 KFolderTreeItem::recursiveFolderSize() const +TQ_INT64 KFolderTreeItem::recursiveFolderSize() const { - Q_INT64 size = mSize; + TQ_INT64 size = mSize; for ( TQListViewItem *item = firstChild() ; item ; item = item->nextSibling() ) @@ -351,7 +351,7 @@ void KFolderTreeItem::setFolderIsCloseToQuota( bool v ) { if ( mFolderIsCloseToQuota != v) { mFolderIsCloseToQuota = v; - repaint(); + tqrepaint(); } } @@ -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( style().isA("KeramikStyle") ) - frameWidth = style().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1; + frameWidth = style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1; else - frameWidth = style().pixelMetric( TQStyle::PM_DefaultFrameWidth ); + frameWidth = style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ); if ( frameWidth < 0 ) frameWidth = 0; if ( frameWidth != lineWidth() ) @@ -464,7 +464,7 @@ bool KFolderTree::acceptDrag( TQDropEvent* event ) const void KFolderTree::addUnreadColumn( const TQString & name, int width ) { mUnreadIndex = addColumn( name, width ); - setColumnAlignment( mUnreadIndex, qApp->reverseLayout() ? Qt::AlignLeft : Qt::AlignRight ); + setColumnAlignment( mUnreadIndex, tqApp->reverseLayout() ? Qt::AlignLeft : Qt::AlignRight ); header()->adjustHeaderSize(); } @@ -472,7 +472,7 @@ void KFolderTree::addUnreadColumn( const TQString & name, int width ) void KFolderTree::addTotalColumn( const TQString & name, int width ) { mTotalIndex = addColumn( name, width ); - setColumnAlignment( mTotalIndex, qApp->reverseLayout() ? Qt::AlignLeft : Qt::AlignRight ); + setColumnAlignment( mTotalIndex, tqApp->reverseLayout() ? Qt::AlignLeft : Qt::AlignRight ); header()->adjustHeaderSize(); } @@ -507,7 +507,7 @@ void KFolderTree::removeTotalColumn() void KFolderTree::addSizeColumn( const TQString & name, int width ) { mSizeIndex = addColumn( name, width ); - setColumnAlignment( mSizeIndex, qApp->reverseLayout() ? Qt::AlignLeft : Qt::AlignRight ); + setColumnAlignment( mSizeIndex, tqApp->reverseLayout() ? Qt::AlignLeft : Qt::AlignRight ); header()->adjustHeaderSize(); } @@ -535,7 +535,7 @@ void KFolderTree::setFullWidth( bool fullWidth ) //----------------------------------------------------------------------------- void KFolderTree::slotSizeChanged( int section, int, int newSize ) { - viewport()->repaint( + viewport()->tqrepaint( header()->sectionPos(section), 0, newSize, visibleHeight(), false ); } diff --git a/libkdepim/kfoldertree.h b/libkdepim/kfoldertree.h index 2d280584..5ababa1c 100644 --- a/libkdepim/kfoldertree.h +++ b/libkdepim/kfoldertree.h @@ -191,8 +191,8 @@ class KDE_EXPORT KFolderTreeItem : public KListViewItem virtual void setTotalCount( int aTotal ); /** set/get the total-count */ - Q_INT64 folderSize() { return mSize; } - virtual void setFolderSize( Q_INT64 aSize ); + TQ_INT64 folderSize() { return mSize; } + virtual void setFolderSize( TQ_INT64 aSize ); /** set/get the protocol of the item */ Protocol protocol() const { return mProtocol; } @@ -205,7 +205,7 @@ class KDE_EXPORT KFolderTreeItem : public KListViewItem /** recursive unread count */ virtual int countUnreadRecursive(); - virtual Q_INT64 recursiveFolderSize() const; + virtual TQ_INT64 recursiveFolderSize() const; /** paints the cell */ virtual void paintCell( TQPainter * p, const TQColorGroup & cg, @@ -233,7 +233,7 @@ class KDE_EXPORT KFolderTreeItem : public KListViewItem Type mType; int mUnread; int mTotal; - Q_INT64 mSize; + TQ_INT64 mSize; bool mFolderIsCloseToQuota; }; @@ -309,7 +309,7 @@ class KDE_EXPORT KFolderTree : public KListView int mSizeIndex; private slots: - /** repaints the complete column (instead of only parts of it as done in + /** tqrepaints the complete column (instead of only parts of it as done in TQListView) if the size has changed */ void slotSizeChanged( int section, int oldSize, int newSize ); diff --git a/libkdepim/kimportdialog.cpp b/libkdepim/kimportdialog.cpp index ffccd500..cb59200a 100644 --- a/libkdepim/kimportdialog.cpp +++ b/libkdepim/kimportdialog.cpp @@ -323,7 +323,7 @@ void KImportDialog::readFile( int rows ) pDialog.setAutoClose(true); KProgress *progress = pDialog.progressBar(); - progress->setTotalSteps( mFile.contains(mSeparator, false) ); + progress->setTotalSteps( mFile.tqcontains(mSeparator, false) ); progress->setValue(0); int progressValue = 0; @@ -337,7 +337,7 @@ void KImportDialog::readFile( int rows ) if (x == mSeparator) { progress->setValue(progressValue++); - if (progressValue % 15 == 0) // try not to constantly repaint + if (progressValue % 15 == 0) // try not to constantly tqrepaint kapp->processEvents(); } @@ -550,9 +550,9 @@ void KImportDialog::assignColumn(TQListViewItem *item) for(int i=selection.leftCol();i<=selection.rightCol();++i) { if (i >= 0) { mTable->horizontalHeader()->setLabel(i,colItem->text(0)); - mColumnDict.replace(i,colItem->column()); + mColumnDict.tqreplace(i,colItem->column()); int format = mFormatCombo->currentItem() + 1; - mFormats.replace(i,format); + mFormats.tqreplace(i,format); colItem->column()->addColId(i); } } @@ -616,8 +616,8 @@ void KImportDialog::assignTemplate() continue; KImportColumn *col = mColumns.at(i); mTable->horizontalHeader()->setLabel( tableColumn, col->header() ); - mColumnDict.replace( tableColumn, col ); - mFormats.replace( tableColumn, format ); + mColumnDict.tqreplace( tableColumn, col ); + mFormats.tqreplace( tableColumn, format ); col->addColId( tableColumn ); } @@ -698,7 +698,7 @@ void KImportDialog::addColumn(KImportColumn *col) void KImportDialog::setData( uint row, uint col, const TQString &value ) { TQString val = value; - val.replace( "\\n", "\n" ); + val.tqreplace( "\\n", "\n" ); if ( row >= mData.count() ) { mData.resize( row + 1 ); @@ -734,7 +734,7 @@ void KImportDialog::saveTemplate() if ( fileName.isEmpty() ) return; - if ( !fileName.contains( ".desktop" ) ) + if ( !fileName.tqcontains( ".desktop" ) ) fileName += ".desktop"; TQString name = KInputDialog::getText( i18n( "Template Name" ), i18n( "Please enter a name for the template:" ) ); diff --git a/libkdepim/kmailcompletion.cpp b/libkdepim/kmailcompletion.cpp index b7c37852..e7e9e17f 100644 --- a/libkdepim/kmailcompletion.cpp +++ b/libkdepim/kmailcompletion.cpp @@ -90,7 +90,7 @@ void KMailCompletion::postProcessMatches( TQStringList * pMatches )const return; //KCompletion has found the keywords for us, we can now map them to mail-addr - TQMap< TQString, bool > mailAddrDistinct; //TODO replace with QSet in KDE4 + TQMap< TQString, bool > mailAddrDistinct; //TODO tqreplace with QSet in KDE4 for ( TQStringList::ConstIterator sit ( pMatches->begin() ), sEnd( pMatches->end() ); sit != sEnd; ++sit ) { const TQStringList &mailAddr = m_keyMap[ (*sit) ]; //get all mailAddr for this keyword for ( TQStringList::ConstIterator sit ( mailAddr.begin() ), sEnd( mailAddr.end() ); sit != sEnd; ++sit ) { diff --git a/libkdepim/kmailcompletion.h b/libkdepim/kmailcompletion.h index e56eb77c..8f29d7e0 100644 --- a/libkdepim/kmailcompletion.h +++ b/libkdepim/kmailcompletion.h @@ -58,14 +58,14 @@ class KMailCompletion : public KCompletion * * Items may be added with KCompletion::addItem, those will only be returned as match if they * are in one of these formats: - * \li contains localpart@domain - * \li contains <email> + * \li tqcontains localpart@domain + * \li tqcontains <email> * or if they have also been added with this function. */ void addItemWithKeys( const TQString& email, int weight, const TQStringList * keyWords); /** - * Uses an internal map to replace all keywords in pMatches whith corrsesponding email addresses. + * Uses an internal map to tqreplace all keywords in pMatches whith corrsesponding email addresses. */ virtual void postProcessMatches( TQStringList * pMatches )const; diff --git a/libkdepim/komposer/core/core.h b/libkdepim/komposer/core/core.h index 7d004c96..91ef133e 100644 --- a/libkdepim/komposer/core/core.h +++ b/libkdepim/komposer/core/core.h @@ -46,7 +46,7 @@ namespace Komposer { Q_OBJECT public: - Core( TQWidget *parentWidget = 0, const char *name = 0 ); + Core( TQWidget *tqparentWidget = 0, const char *name = 0 ); virtual ~Core(); public slots: diff --git a/libkdepim/komposer/core/pluginmanager.cpp b/libkdepim/komposer/core/pluginmanager.cpp index c7cf7492..d4fd5acc 100644 --- a/libkdepim/komposer/core/pluginmanager.cpp +++ b/libkdepim/komposer/core/pluginmanager.cpp @@ -82,8 +82,8 @@ PluginManager::PluginManager( TQObject *parent ) this, TQT_SLOT( loadAllPlugins() ) ); d->plugins = KPluginInfo::fromServices( - KTrader::self()->query( TQString::fromLatin1( "Komposer/Plugin" ), - TQString::fromLatin1( "[X-Komposer-Version] == 1" ) ) ); + KTrader::self()->query( TQString::tqfromLatin1( "Komposer/Plugin" ), + TQString::tqfromLatin1( "[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::fromLatin1( ", " ) ) << endl + << remaining.join( TQString::tqfromLatin1( ", " ) ) << 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::fromLatin1( "Plugins" ) ); + TQString::tqfromLatin1( "Plugins" ) ); TQMap<TQString, TQString>::Iterator it; for ( it = entries.begin(); it != entries.end(); ++it ) { TQString key = it.key(); - if ( key.endsWith( TQString::fromLatin1( "Enabled" ) ) ) + if ( key.endsWith( TQString::tqfromLatin1( "Enabled" ) ) ) { key.setLength( key.length() - 7 ); //kdDebug() << k_funcinfo << "Set " << key << " to " << it.data() << endl; - if ( it.data() == TQString::fromLatin1( "true" ) ) + if ( it.data() == TQString::tqfromLatin1( "true" ) ) { if ( !plugin( key ) ) d->pluginsToLoad.push( key ); @@ -305,13 +305,13 @@ PluginManager::loadPluginInternal( const TQString &pluginId ) return 0; } - if ( d->loadedPlugins.contains( info ) ) + if ( d->loadedPlugins.tqcontains( info ) ) return d->loadedPlugins[ info ]; int error = 0; Plugin *plugin = KParts::ComponentFactory::createInstanceFromQuery<Komposer::Plugin>( - TQString::fromLatin1( "Komposer/Plugin" ), - TQString::fromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).arg( pluginId ), + TQString::tqfromLatin1( "Komposer/Plugin" ), + TQString::tqfromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).arg( pluginId ), this, 0, TQStringList(), &error ); if ( plugin ) { @@ -408,7 +408,7 @@ PluginManager::plugin( const TQString &pluginId ) const if ( !info ) return 0; - if ( d->loadedPlugins.contains( info ) ) + if ( d->loadedPlugins.tqcontains( info ) ) return d->loadedPlugins[ info ]; else return 0; @@ -424,7 +424,7 @@ PluginManager::pluginName( const Plugin *plugin ) const return it.key()->name(); } - return TQString::fromLatin1( "Unknown" ); + return TQString::tqfromLatin1( "Unknown" ); } QString @@ -437,7 +437,7 @@ PluginManager::pluginId( const Plugin *plugin ) const return it.key()->pluginName(); } - return TQString::fromLatin1( "unknown" ); + return TQString::tqfromLatin1( "unknown" ); } QString @@ -450,7 +450,7 @@ PluginManager::pluginIcon( const Plugin *plugin ) const return it.key()->icon(); } - return TQString::fromLatin1( "Unknown" ); + return TQString::tqfromLatin1( "Unknown" ); } KPluginInfo* @@ -478,7 +478,7 @@ PluginManager::setPluginEnabled( const TQString &pluginId, bool enabled /* = tru if ( !infoForPluginId( pluginId ) ) return false; - d->config->writeEntry( pluginId + TQString::fromLatin1( "Enabled" ), enabled ); + d->config->writeEntry( pluginId + TQString::tqfromLatin1( "Enabled" ), enabled ); d->config->sync(); return true; diff --git a/libkdepim/komposer/core/prefsmodule.cpp b/libkdepim/komposer/core/prefsmodule.cpp index 7dd1673e..3536ebb8 100644 --- a/libkdepim/komposer/core/prefsmodule.cpp +++ b/libkdepim/komposer/core/prefsmodule.cpp @@ -75,8 +75,8 @@ EditorSelection::EditorSelection( const TQString &text, TQString &reference, : m_reference( reference ) { m_box = new TQGroupBox( 0, Qt::Vertical, text, parent ); - TQVBoxLayout *boxLayout = new TQVBoxLayout( m_box->layout() ); - boxLayout->setAlignment( Qt::AlignTop ); + TQVBoxLayout *boxLayout = new TQVBoxLayout( m_box->tqlayout() ); + boxLayout->tqsetAlignment( Qt::AlignTop ); m_editorsCombo = new KComboBox( m_box ); boxLayout->addWidget( m_editorsCombo ); @@ -101,16 +101,16 @@ EditorSelection::readConfig() m_editorsCombo->clear(); KTrader::OfferList editors = KTrader::self()->query( - TQString::fromLatin1( "Komposer/Editor" ) ); + TQString::tqfromLatin1( "Komposer/Editor" ) ); KTrader::OfferList::ConstIterator it; int i = 0; for ( it = editors.begin(); it != editors.end(); ++it, ++i ) { - if ( !(*it)->hasServiceType( TQString::fromLatin1( "Komposer/Editor" ) ) ) + if ( !(*it)->hasServiceType( TQString::tqfromLatin1( "Komposer/Editor" ) ) ) continue; TQString name = (*it)->property( "X-KDE-KomposerIdentifier" ).toString(); m_editorsCombo->insertItem( name ); - if ( m_reference.contains( name ) ) + if ( m_reference.tqcontains( name ) ) m_editorsCombo->setCurrentItem( i ); } } diff --git a/libkdepim/komposer/core/tests/testmanager.cpp b/libkdepim/komposer/core/tests/testmanager.cpp index 8895cfe9..0fcba16b 100644 --- a/libkdepim/komposer/core/tests/testmanager.cpp +++ b/libkdepim/komposer/core/tests/testmanager.cpp @@ -34,7 +34,7 @@ void TestManager::slotAllPluginsLoaded() { kdDebug()<<"Done"<<endl; m_manager->shutdown(); - qApp->exit(); + tqApp->exit(); } void TestManager::slotPluginLoaded( Plugin *plugin ) diff --git a/libkdepim/komposer/plugins/default/defaulteditor.cpp b/libkdepim/komposer/plugins/default/defaulteditor.cpp index b8abf17b..56f97d22 100644 --- a/libkdepim/komposer/plugins/default/defaulteditor.cpp +++ b/libkdepim/komposer/plugins/default/defaulteditor.cpp @@ -36,8 +36,8 @@ #include <kprinter.h> #include <kfinddialog.h> #include <kfind.h> -#include <kreplacedialog.h> -#include <kreplace.h> +#include <ktqreplacedialog.h> +#include <ktqreplace.h> #include <tqtextedit.h> #include <tqwidget.h> @@ -89,7 +89,7 @@ DefaultEditor::changeSignature( const TQString &sig ) int sigStart = text.findRev( "-- " ); TQString sigText = TQString( "-- \n%1" ).arg( sig ); - text.replace( sigStart, text.length(), sigText ); + text.tqreplace( sigStart, text.length(), sigText ); } void @@ -202,10 +202,10 @@ DefaultEditor::createActions( KActionCollection *ac ) connect( m_actionAlignJustify, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setAlignJustify(bool)) ); - m_actionAlignLeft->setExclusiveGroup( "alignment" ); - m_actionAlignCenter->setExclusiveGroup( "alignment" ); - m_actionAlignRight->setExclusiveGroup( "alignment" ); - m_actionAlignJustify->setExclusiveGroup( "alignment" ); + m_actionAlignLeft->setExclusiveGroup( "tqalignment" ); + m_actionAlignCenter->setExclusiveGroup( "tqalignment" ); + m_actionAlignRight->setExclusiveGroup( "tqalignment" ); + m_actionAlignJustify->setExclusiveGroup( "tqalignment" ); // // Tools @@ -244,7 +244,7 @@ DefaultEditor::updateCharFmt() void DefaultEditor::updateAligment() { - int align = m_textEdit->alignment(); + int align = m_textEdit->tqalignment(); switch ( align ) { case AlignRight: @@ -288,28 +288,28 @@ void DefaultEditor::setAlignLeft( bool yes ) { if ( yes ) - m_textEdit->setAlignment( AlignLeft ); + m_textEdit->tqsetAlignment( AlignLeft ); } void DefaultEditor::setAlignRight( bool yes ) { if ( yes ) - m_textEdit->setAlignment( AlignRight ); + m_textEdit->tqsetAlignment( AlignRight ); } void DefaultEditor::setAlignCenter( bool yes ) { if ( yes ) - m_textEdit->setAlignment( AlignCenter ); + m_textEdit->tqsetAlignment( AlignCenter ); } void DefaultEditor::setAlignJustify( bool yes ) { if ( yes ) - m_textEdit->setAlignment( AlignJustify ); + m_textEdit->tqsetAlignment( AlignJustify ); } // diff --git a/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp b/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp index b615c40b..922e5126 100644 --- a/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp +++ b/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp @@ -26,11 +26,11 @@ #include <kapplication.h> #include <kdepimmacros.h> -KPartsGenericPart::KPartsGenericPart( TQWidget* parentWidget, const char* name ) - : TQWidget( parentWidget, name ), m_part( 0 ) +KPartsGenericPart::KPartsGenericPart( TQWidget* tqparentWidget, const char* name ) + : TQWidget( tqparentWidget, name ), m_part( 0 ) { - TQVBoxLayout* layout = new TQVBoxLayout( this ); - layout->setAutoAdd( true ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); + tqlayout->setAutoAdd( true ); } void KPartsGenericPart::load() diff --git a/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.h b/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.h index 5df3db24..1302b137 100644 --- a/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.h +++ b/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.h @@ -34,7 +34,7 @@ class KPartsGenericPart : public TQWidget { Q_PROPERTY( TQString url READ url WRITE setURL ) Q_PROPERTY( TQString mimetype READ mimetype WRITE setMimetype ) public: - KPartsGenericPart( TQWidget* parentWidget, const char* name ); + KPartsGenericPart( TQWidget* tqparentWidget, const char* name ); TQString url() const { return m_url; } void setURL( const TQString& url ) { m_url = url; load(); } diff --git a/libkdepim/kpixmapregionselectorwidget.cpp b/libkdepim/kpixmapregionselectorwidget.cpp index 918d3b84..308ae0cc 100644 --- a/libkdepim/kpixmapregionselectorwidget.cpp +++ b/libkdepim/kpixmapregionselectorwidget.cpp @@ -227,7 +227,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev) }; TQCursor cursor; - if ( m_selectedRegion.contains( mev->pos() ) + if ( m_selectedRegion.tqcontains( mev->pos() ) && m_selectedRegion!=m_originalPixmap.rect() ) { m_state=Moving; diff --git a/libkdepim/kprefsdialog.cpp b/libkdepim/kprefsdialog.cpp index 1af04fd4..93b3feaa 100644 --- a/libkdepim/kprefsdialog.cpp +++ b/libkdepim/kprefsdialog.cpp @@ -376,7 +376,7 @@ KPrefsWidDate::KPrefsWidDate( KConfigSkeleton::ItemDateTime *item, void KPrefsWidDate::readConfig() { - mDateEdit->setDate( mItem->value().date().isValid() ? mItem->value().date() : TQDate::currentDate() ); + mDateEdit->setDate( mItem->value().date().isValid() ? mItem->value().date() : TQDate::tqcurrentDate() ); } void KPrefsWidDate::writeConfig() @@ -766,18 +766,18 @@ void KPrefsDialog::autoCreate() kdDebug() << "ITEMS: " << (*it)->name() << endl; TQWidget *page; - TQGridLayout *layout; + TQGridLayout *tqlayout; int currentRow; - if ( !mGroupPages.contains( group ) ) { + if ( !mGroupPages.tqcontains( group ) ) { page = addPage( group ); - layout = new TQGridLayout( page ); + tqlayout = new TQGridLayout( page ); mGroupPages.insert( group, page ); - mGroupLayouts.insert( group, layout ); + mGroupLayouts.insert( group, tqlayout ); currentRow = 0; mCurrentRows.insert( group, currentRow ); } else { page = mGroupPages[ group ]; - layout = mGroupLayouts[ group ]; + tqlayout = mGroupLayouts[ group ]; currentRow = mCurrentRows[ group ]; } @@ -786,11 +786,11 @@ void KPrefsDialog::autoCreate() if ( wid ) { TQValueList<TQWidget *> widgets = wid->widgets(); if ( widgets.count() == 1 ) { - layout->addMultiCellWidget( widgets[ 0 ], + tqlayout->addMultiCellWidget( widgets[ 0 ], currentRow, currentRow, 0, 1 ); } else if ( widgets.count() == 2 ) { - layout->addWidget( widgets[ 0 ], currentRow, 0 ); - layout->addWidget( widgets[ 1 ], currentRow, 1 ); + tqlayout->addWidget( widgets[ 0 ], currentRow, 0 ); + tqlayout->addWidget( widgets[ 1 ], currentRow, 1 ); } else { kdError() << "More widgets than expected: " << widgets.count() << endl; } @@ -804,7 +804,7 @@ void KPrefsDialog::autoCreate() addWid( wid ); - mCurrentRows.replace( group, ++currentRow ); + mCurrentRows.tqreplace( group, ++currentRow ); } } diff --git a/libkdepim/kprefsdialog.h b/libkdepim/kprefsdialog.h index 3c9f85cc..3667a7ae 100644 --- a/libkdepim/kprefsdialog.h +++ b/libkdepim/kprefsdialog.h @@ -86,7 +86,7 @@ class KDE_EXPORT KPrefsWid : public QObject @short Widgets for bool settings in @ref KPrefsDialog. This class provides a control element for configuring bool values. It is meant - to be used by KPrefsDialog. The user is responsible for the layout management. + to be used by KPrefsDialog. The user is responsible for the tqlayout management. */ class KDE_EXPORT KPrefsWidBool : public KPrefsWid { @@ -119,7 +119,7 @@ class KDE_EXPORT KPrefsWidBool : public KPrefsWid @short Widgets for int settings in @ref KPrefsDialog. This class provides a control element for configuring integer values. It is - meant to be used by KPrefsDialog. The user is responsible for the layout + meant to be used by KPrefsDialog. The user is responsible for the tqlayout management. */ class KDE_EXPORT KPrefsWidInt : public KPrefsWid @@ -160,7 +160,7 @@ class KDE_EXPORT KPrefsWidInt : public KPrefsWid @short Widgets for time settings in @ref KPrefsDialog. This class provides a control element for configuring time values. It is - meant to be used by KPrefsDialog. The user is responsible for the layout + meant to be used by KPrefsDialog. The user is responsible for the tqlayout management. */ class KDE_EXPORT KPrefsWidTime : public KPrefsWid @@ -197,7 +197,7 @@ class KDE_EXPORT KPrefsWidTime : public KPrefsWid @short Widgets for duration settings in @ref KPrefsDialog. This class provides a control element for configuring duration values. It is - meant to be used by KPrefsDialog. The user is responsible for the layout + meant to be used by KPrefsDialog. The user is responsible for the tqlayout management. */ class KDE_EXPORT KPrefsWidDuration : public KPrefsWid @@ -235,7 +235,7 @@ class KDE_EXPORT KPrefsWidDuration : public KPrefsWid @short Widgets for time settings in @ref KPrefsDialog. This class provides a control element for configuring date values. It is - meant to be used by KPrefsDialog. The user is responsible for the layout + meant to be used by KPrefsDialog. The user is responsible for the tqlayout management. */ class KDE_EXPORT KPrefsWidDate : public KPrefsWid @@ -272,7 +272,7 @@ class KDE_EXPORT KPrefsWidDate : public KPrefsWid @short Widgets for color settings in @ref KPrefsDialog. This class provides a control element for configuring color values. It is - meant to be used by KPrefsDialog. The user is responsible for the layout + meant to be used by KPrefsDialog. The user is responsible for the tqlayout management. */ class KDE_EXPORT KPrefsWidColor : public KPrefsWid @@ -315,7 +315,7 @@ class KDE_EXPORT KPrefsWidColor : public KPrefsWid @short Widgets for font settings in @ref KPrefsDialog. This class provides a control element for configuring font values. It is meant - to be used by KPrefsDialog. The user is responsible for the layout management. + to be used by KPrefsDialog. The user is responsible for the tqlayout management. */ class KDE_EXPORT KPrefsWidFont : public KPrefsWid { @@ -368,7 +368,7 @@ class KDE_EXPORT KPrefsWidFont : public KPrefsWid @ref KPrefsDialog. This class provides a control element for configuring selections. It is meant - to be used by KPrefsDialog. The user is responsible for the layout management. + to be used by KPrefsDialog. The user is responsible for the tqlayout management. The setting is interpreted as an int value, corresponding to the position of the radio button. The position of the button is defined by the sequence of @@ -417,7 +417,7 @@ class KDE_EXPORT KPrefsWidRadios : public KPrefsWid @ref KPrefsDialog. This class provides a control element for configuring selections. It is meant - to be used by KPrefsDialog. The user is responsible for the layout management. + to be used by KPrefsDialog. The user is responsible for the tqlayout management. The setting is interpreted as an int value, corresponding to the index in the combo box. @@ -452,7 +452,7 @@ class KDE_EXPORT KPrefsWidCombo : public KPrefsWid @short Widgets for string settings in @ref KPrefsDialog. This class provides a control element for configuring string values. It is - meant to be used by KPrefsDialog. The user is responsible for the layout + meant to be used by KPrefsDialog. The user is responsible for the tqlayout management. */ class KDE_EXPORT KPrefsWidString : public KPrefsWid @@ -499,7 +499,7 @@ class KDE_EXPORT KPrefsWidString : public KPrefsWid @short Widgets for string settings in @ref KPrefsDialog. This class provides a control element for configuring string values. It is - meant to be used by KPrefsDialog. The user is responsible for the layout + meant to be used by KPrefsDialog. The user is responsible for the tqlayout management. */ class KDE_EXPORT KPrefsWidPath : public KPrefsWid @@ -708,7 +708,7 @@ class KDE_EXPORT KPrefsWidManager This class provides the framework for a preferences dialog. You have to subclass it and add the code to create the actual configuration widgets and - do the layout management. + do the tqlayout management. KPrefsDialog provides functions to add subclasses of @ref KPrefsWid via KPrefsWidManager. For these widgets the reading, writing and setting to diff --git a/libkdepim/kregexp3.cpp b/libkdepim/kregexp3.cpp index 6bb519e5..f34dad33 100644 --- a/libkdepim/kregexp3.cpp +++ b/libkdepim/kregexp3.cpp @@ -37,13 +37,13 @@ #include <kdebug.h> #endif -TQString KRegExp3::replace( const TQString & str, - const TQString & replacementStr, +TQString KRegExp3::tqreplace( const TQString & str, + const TQString & tqreplacementStr, int start, bool global ) { int oldpos, pos; - //-------- parsing the replacementStr into + //-------- parsing the tqreplacementStr into //-------- literal parts and backreferences: TQStringList literalStrs; TQValueList<int> backRefs; @@ -55,30 +55,30 @@ TQString KRegExp3::replace( const TQString & str, TQRegExp brx("\\"); #ifdef DEBUG_KREGEXP3 - kdDebug() << "Analyzing replacementStr: \"" + replacementStr + "\"" << endl; + kdDebug() << "Analyzing tqreplacementStr: \"" + tqreplacementStr + "\"" << endl; #endif oldpos = 0; pos = 0; while ( true ) { - pos = rx.search( replacementStr, pos ); + pos = rx.search( tqreplacementStr, pos ); #ifdef DEBUG_KREGEXP3 kdDebug() << TQString(" Found match at pos %1").arg(pos) << endl; #endif if ( pos < 0 ) { - literalStrs << replacementStr.mid( oldpos ) - .replace( bbrx, "\\" ) - .replace( brx, "" ); + literalStrs << tqreplacementStr.mid( oldpos ) + .tqreplace( bbrx, "\\" ) + .tqreplace( brx, "" ); #ifdef DEBUG_KREGEXP3 kdDebug() << " No more matches. Last literal is \"" + literalStrs.last() + "\"" << endl; #endif break; } else { - literalStrs << replacementStr.mid( oldpos, pos-oldpos ) - .replace( bbrx, "\\" ) - .replace( brx, "" ); + literalStrs << tqreplacementStr.mid( oldpos, pos-oldpos ) + .tqreplace( bbrx, "\\" ) + .tqreplace( brx, "" ); #ifdef DEBUG_KREGEXP3 kdDebug() << TQString(" Inserting \"") + literalStrs.last() + "\" as literal." << endl; kdDebug() << " Searching for corresponding digit(s):" << endl; @@ -101,7 +101,7 @@ TQString KRegExp3::replace( const TQString & str, } #ifdef DEBUG_KREGEXP3 - kdDebug() << "Finished the analysis of replacementStr!" << endl; + kdDebug() << "Finished the analysis of tqreplacementStr!" << endl; #endif Q_ASSERT( literalStrs.count() == backRefs.count() + 1 ); @@ -145,7 +145,7 @@ TQString KRegExp3::replace( const TQString & str, iIt != backRefs.end() ; ++sIt, ++iIt ) { result += (*sIt); #ifdef DEBUG_KREGEXP3 - kdDebug() << " Adding literal replacement part:" << endl; + kdDebug() << " Adding literal tqreplacement part:" << endl; kdDebug() << " result == \"" + result + "\"" << endl; #endif result += cap( (*iIt) ); @@ -156,7 +156,7 @@ TQString KRegExp3::replace( const TQString & str, } result += (*sIt); #ifdef DEBUG_KREGEXP3 - kdDebug() << " Adding literal replacement part:" << endl; + kdDebug() << " Adding literal tqreplacement part:" << endl; kdDebug() << " result == \"" + result + "\"" << endl; #endif } @@ -173,7 +173,7 @@ TQString KRegExp3::replace( const TQString & str, oldpos = pos; if ( !global ) { - // only replace the first occurrence, so stop here: + // only tqreplace the first occurrence, so stop here: result += str.mid( oldpos ); break; } diff --git a/libkdepim/kregexp3.h b/libkdepim/kregexp3.h index 40c7681d..c9b53c5f 100644 --- a/libkdepim/kregexp3.h +++ b/libkdepim/kregexp3.h @@ -36,21 +36,21 @@ #include <kdepimmacros.h> -/** @short A TQRegExp (Qt3.x) with a replace() method. +/** @short A TQRegExp (Qt3.x) with a tqreplace() method. This class is simply there to provide a namespace for some nice enhancements of the mighty TQRegExp (Qt3 version) regular - expression engine, namely the method replace(), which can be - used to do search-and-replace like one is used to from perl or sed. + expression engine, namely the method tqreplace(), which can be + used to do search-and-tqreplace like one is used to from perl or sed. - It "simply" adds the ability to define a replacement string which - contains references to the captured substrings. The following + It "simply" adds the ability to define a tqreplacement string which + tqcontains references to the captured substrings. The following constructs are understood, which can be freely mixed in the - replacement string: + tqreplacement string: @section Sed syntax - Back references in the replacement string are made using \n + Back references in the tqreplacement string are made using \n (backslash-digit), where @p n is a single digit. With this mode of operation, only the first nine captured substrings can be referenced. @@ -60,7 +60,7 @@ @section Perl syntax - Back references in the replacement string are made using $n + Back references in the tqreplacement string are made using $n (dollarsign-digit), where @p n is a single digit. With this mode of operation, only the first nine captured substrings can be referenced. @@ -91,21 +91,21 @@ public: : TQRegExp( (TQRegExp)rx ) {} /** Replaces each matching subpattern in @p str with - @p replacementStr, inserting captured substrings for + @p tqreplacementStr, inserting captured substrings for \\n, $n and ${nn} as described in the class documentation. @param str The source string. - @param replacementStr The string which replaces matched + @param tqreplacementStr The string which tqreplaces matched substrings of @p str. @param start Start position for the search. If @p start is negative, starts @p -(start) positions from the end of @p str. - @param global If @p TRUE, requests to replace all occurrences - of the regexp with @p replacementStr; if @p FALSE, - only the first occurrence will be replaced. + @param global If @p TRUE, requests to tqreplace all occurrences + of the regexp with @p tqreplacementStr; if @p FALSE, + only the first occurrence will be tqreplaced. Equivalent to the /g switch to perl's s/// operator. @return The modified string. */ - TQString replace( const TQString & str, - const TQString & replacementStr, + TQString tqreplace( const TQString & str, + const TQString & tqreplacementStr, int start=0, bool global=TRUE ); }; diff --git a/libkdepim/krsqueezedtextlabel.cpp b/libkdepim/krsqueezedtextlabel.cpp index c61a706b..ef9746ee 100644 --- a/libkdepim/krsqueezedtextlabel.cpp +++ b/libkdepim/krsqueezedtextlabel.cpp @@ -24,30 +24,30 @@ KRSqueezedTextLabel::KRSqueezedTextLabel( const TQString &text , TQWidget *parent, const char *name ) : TQLabel ( parent, name ) { - setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); fullText = text; squeezeTextToLabel(); } KRSqueezedTextLabel::KRSqueezedTextLabel( TQWidget *parent, const char *name ) : TQLabel ( parent, name ) { - setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); } void KRSqueezedTextLabel::resizeEvent( TQResizeEvent * ) { squeezeTextToLabel(); } -TQSize KRSqueezedTextLabel::minimumSizeHint() const +TQSize KRSqueezedTextLabel::tqminimumSizeHint() const { - TQSize sh = TQLabel::minimumSizeHint(); + TQSize sh = TQLabel::tqminimumSizeHint(); sh.setWidth(-1); return sh; } -TQSize KRSqueezedTextLabel::sizeHint() const +TQSize KRSqueezedTextLabel::tqsizeHint() const { - return TQSize(contentsRect().width(), TQLabel::sizeHint().height()); + return TQSize(contentsRect().width(), TQLabel::tqsizeHint().height()); } void KRSqueezedTextLabel::setText( const TQString &text ) { @@ -75,11 +75,11 @@ void KRSqueezedTextLabel::squeezeTextToLabel() { } } -void KRSqueezedTextLabel::setAlignment( int alignment ) +void KRSqueezedTextLabel::tqsetAlignment( int tqalignment ) { // save fullText and restore it TQString tmpFull(fullText); - TQLabel::setAlignment(alignment); + TQLabel::tqsetAlignment(tqalignment); fullText = tmpFull; } diff --git a/libkdepim/krsqueezedtextlabel.h b/libkdepim/krsqueezedtextlabel.h index a5e4e776..13627252 100644 --- a/libkdepim/krsqueezedtextlabel.h +++ b/libkdepim/krsqueezedtextlabel.h @@ -25,7 +25,7 @@ #include <kdepimmacros.h> /** - * @short A replacement for TQLabel that squeezes its text + * @short A tqreplacement for TQLabel that squeezes its text * * A label class that squeezes its text into the label * @@ -48,12 +48,12 @@ public: KRSqueezedTextLabel( TQWidget *parent, const char *name = 0 ); KRSqueezedTextLabel( const TQString &text, TQWidget *parent, const char *name = 0 ); - virtual TQSize minimumSizeHint() const; - virtual TQSize sizeHint() const; + virtual TQSize tqminimumSizeHint() const; + virtual TQSize tqsizeHint() const; /** * Overridden for internal reasons; the API remains unaffected. */ - virtual void setAlignment( int ); + virtual void tqsetAlignment( int ); public slots: void setText( const TQString & ); diff --git a/libkdepim/kscoring.cpp b/libkdepim/kscoring.cpp index 17dd1d43..c9d1f614 100644 --- a/libkdepim/kscoring.cpp +++ b/libkdepim/kscoring.cpp @@ -47,19 +47,19 @@ static TQString toXml(const TQString& str) uint i = 0; while ( i < len ) { if (tmp[(int)i] == '<') { - tmp.replace(i, 1, "<"); + tmp.tqreplace(i, 1, "<"); len += 3; i += 4; } else if (tmp[(int)i] == '"') { - tmp.replace(i, 1, """); + tmp.tqreplace(i, 1, """); len += 5; i += 6; } else if (tmp[(int)i] == '&') { - tmp.replace(i, 1, "&"); + tmp.tqreplace(i, 1, "&"); len += 4; i += 5; } else if (tmp[(int)i] == '>') { - tmp.replace(i, 1, ">"); + tmp.tqreplace(i, 1, ">"); len += 3; i += 4; } else { @@ -91,7 +91,7 @@ NotifyDialog::NotifyDialog(TQWidget* p) void NotifyDialog::slotShowAgainToggled(bool flag) { - dict.replace(msg,!flag); + dict.tqreplace(msg,!flag); kdDebug(5100) << "note \"" << note << "\" will popup again: " << flag << endl; } @@ -109,7 +109,7 @@ void NotifyDialog::display(ScorableArticle& a, const TQString& s) arg(a.subject()). arg(s); me->note->setText(msg); - if ( i == dict.end() ) i = dict.replace(s,false); + if ( i == dict.end() ) i = dict.tqreplace(s,false); me->adjustSize(); me->exec(); } @@ -773,7 +773,7 @@ TQString KScoringRule::getExpireDateString() const bool KScoringRule::isExpired() const { - return (expires.isValid() && (expires < TQDate::currentDate())); + return (expires.isValid() && (expires < TQDate::tqcurrentDate())); } @@ -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::currentDate().addDays(30)); + rule->setExpireDate(TQDate::tqcurrentDate().addDays(30)); addRule(rule); KScoringEditor *edit = KScoringEditor::createEditor(this); edit->setRule(rule); diff --git a/libkdepim/kscoringeditor.cpp b/libkdepim/kscoringeditor.cpp index 6c469f49..de76d3e8 100644 --- a/libkdepim/kscoringeditor.cpp +++ b/libkdepim/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 - setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Fixed)); + tqsetSizePolicy(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->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); + groupsBox->tqsetSizePolicy(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::currentDate().daysTo(rule->getExpireDate())); + expireEdit->setValue(TQDate::tqcurrentDate().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::currentDate().addDays(expireEdit->value())); + rule->setExpireDate(TQDate::tqcurrentDate().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->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); + filterBox->tqsetSizePolicy(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, sizeHint().height()); + resize(550, tqsizeHint().height()); } void KScoringEditor::setDirty() @@ -918,7 +918,7 @@ void KScoringEditor::slotDoShrink() { updateGeometry(); TQApplication::sendPostedEvents(); - resize(width(),sizeHint().height()); + resize(width(),tqsizeHint().height()); } void KScoringEditor::slotApply() @@ -996,7 +996,7 @@ void KScoringEditorWidgetDialog::slotDoShrink() { updateGeometry(); TQApplication::sendPostedEvents(); - resize(width(),sizeHint().height()); + resize(width(),tqsizeHint().height()); } //============================================================================ diff --git a/libkdepim/ksubscription.cpp b/libkdepim/ksubscription.cpp index f61b633c..f1c5b657 100644 --- a/libkdepim/ksubscription.cpp +++ b/libkdepim/ksubscription.cpp @@ -271,7 +271,7 @@ KSubscription::KSubscription( TQWidget *parent, const TQString &caption, else groupView->header()->setStretchEnabled(true, 0); - // layout + // tqlayout TQGridLayout *topL = new TQGridLayout(page,4,1,0, KDialog::spacingHint()); TQHBoxLayout *filterL = new TQHBoxLayout(KDialog::spacingHint()); TQVBoxLayout *arrL = new TQVBoxLayout(KDialog::spacingHint()); diff --git a/libkdepim/ktimeedit.cpp b/libkdepim/ktimeedit.cpp index 2e82b7df..9b955952 100644 --- a/libkdepim/ktimeedit.cpp +++ b/libkdepim/ktimeedit.cpp @@ -104,7 +104,7 @@ public: // KTimeWidget/QTimeEdit provide nicer editing, but don't provide a combobox. // Difficult to get all in one... -// But Qt-3.2 will offer TQLineEdit::setMask, so a "99:99" mask would help. +// But Qt-3.2 will offer TQLineEdit::setMask, so a "99:99" tqmask would help. KTimeEdit::KTimeEdit( TQWidget *parent, TQTime qt, const char *name ) : TQComboBox( true, parent, name ) { diff --git a/libkdepim/kvcarddrag.cpp b/libkdepim/kvcarddrag.cpp index b8057367..1217d6fb 100644 --- a/libkdepim/kvcarddrag.cpp +++ b/libkdepim/kvcarddrag.cpp @@ -68,7 +68,7 @@ bool KVCardDrag::decode( TQMimeSource *e, TQByteArray &content ) if ( !canDecode( e ) ) { return false; } - content = e->encodedData( vcard_mime_string ); + content = e->tqencodedData( 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->encodedData( vcard_mime_string ) ); + content = TQString::fromUtf8( e->tqencodedData( 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->encodedData( vcard_mime_string ).data() ); + addressees = KABC::VCardConverter().parseVCardsRaw( e->tqencodedData( vcard_mime_string ).data() ); #else - addressees = KABC::VCardConverter().parseVCards( e->encodedData( vcard_mime_string ) ); + addressees = KABC::VCardConverter().parseVCards( e->tqencodedData( vcard_mime_string ) ); #endif return true; } diff --git a/libkdepim/kvcarddrag.h b/libkdepim/kvcarddrag.h index 30d8dd74..3e99a0e6 100644 --- a/libkdepim/kvcarddrag.h +++ b/libkdepim/kvcarddrag.h @@ -66,7 +66,7 @@ class KDE_EXPORT KVCardDrag : public QStoredDrag void setVCard( const TQString &content ); #endif /** - * Returns true if the MIME source @p e contains a vcard object. + * Returns true if the MIME source @p e tqcontains a vcard object. */ static bool canDecode( TQMimeSource *e ); diff --git a/libkdepim/kwidgetlister.cpp b/libkdepim/kwidgetlister.cpp index e26b0530..13e1675b 100644 --- a/libkdepim/kwidgetlister.cpp +++ b/libkdepim/kwidgetlister.cpp @@ -135,7 +135,7 @@ void KWidgetLister::addWidgetAtEnd(TQWidget *w) void KWidgetLister::removeLastWidget() { - // The layout will take care that the + // The tqlayout will take care that the // widget is removed from screen, too. mWidgetList.removeLast(); enableControls(); diff --git a/libkdepim/kwidgetlister.h b/libkdepim/kwidgetlister.h index cd1ed625..19616aa1 100644 --- a/libkdepim/kwidgetlister.h +++ b/libkdepim/kwidgetlister.h @@ -73,19 +73,19 @@ protected slots: /** Called whenever the user clicks on the 'more' button. Reimplementations should call this method, because this implementation does all the dirty work with adding the widgets - to the layout (through @ref addWidgetAtEnd) and enabling/disabling + to the tqlayout (through @ref addWidgetAtEnd) and enabling/disabling the control buttons. */ virtual void slotMore(); /** Called whenever the user clicks on the 'fewer' button. Reimplementations should call this method, because this implementation does all the dirty work with removing the widgets - from the layout (through @ref removeLastWidget) and + from the tqlayout (through @ref removeLastWidget) and enabling/disabling the control buttons. */ virtual void slotFewer(); /** Called whenever the user clicks on the 'clear' button. Reimplementations should call this method, because this implementation does all the dirty work with removing all but - @ref mMinWidgets widgets from the layout and enabling/disabling + @ref mMinWidgets widgets from the tqlayout and enabling/disabling the control buttons. */ virtual void slotClear(); @@ -115,7 +115,7 @@ protected: /** Because QT 2.x does not support signals/slots in template classes, we are forced to emulate this by forcing the implementers of subclasses of KWidgetLister to reimplement this - function which replaces the "@p new @p T" call. */ + function which tqreplaces the "@p new @p T" call. */ virtual TQWidget* createWidget( TQWidget *parent ); /** Sets the number of widgets on scrren to exactly @p aNum. Doesn't check if @p aNum is inside the range @p diff --git a/libkdepim/kxface.cpp b/libkdepim/kxface.cpp index ecd24bc2..9813da7c 100644 --- a/libkdepim/kxface.cpp +++ b/libkdepim/kxface.cpp @@ -132,8 +132,8 @@ TQString KXFace::fromImage( const TQImage &image ) tmp[i-1] = t; } } - tmp.replace( TQRegExp( "(\\w{12})" ), "\\1\n" ); - tmp.replace( TQRegExp( "(\\w{4})" ), "0x\\1," ); + tmp.tqreplace( TQRegExp( "(\\w{12})" ), "\\1\n" ); + tmp.tqreplace( TQRegExp( "(\\w{4})" ), "0x\\1," ); len = tmp.length(); char *fbuf = (char *)malloc( len + 1 ); strncpy( fbuf, (const char *)tmp, len ); diff --git a/libkdepim/ldapclient.cpp b/libkdepim/ldapclient.cpp index 39d384e8..bf4f995e 100644 --- a/libkdepim/ldapclient.cpp +++ b/libkdepim/ldapclient.cpp @@ -49,7 +49,7 @@ static KStaticDeleter<KConfig> configDeleter; TQString LdapObject::toString() const { - TQString result = TQString::fromLatin1( "\ndn: %1\n" ).arg( dn ); + TQString result = TQString::tqfromLatin1( "\ndn: %1\n" ).arg( 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 ) { @@ -575,7 +575,7 @@ void LdapSearch::makeSearchData( TQStringList& ret, LdapResultList& resList ) // must use the correct SMTP server, by definition. // //mail = (*it1).client->base().simplifyWhiteSpace(); - //mail.replace( ",dc=", ".", false ); + //mail.tqreplace( ",dc=", ".", false ); //if( mail.startsWith("dc=", false) ) // mail.remove(0, 3); //mail.prepend( '@' ); diff --git a/libkdepim/ldapsearchdialog.cpp b/libkdepim/ldapsearchdialog.cpp index a51ccfb9..37b29f6d 100644 --- a/libkdepim/ldapsearchdialog.cpp +++ b/libkdepim/ldapsearchdialog.cpp @@ -137,7 +137,7 @@ LDAPSearchDialog::LDAPSearchDialog( TQWidget* parent, const char* name ) groupBox->setFrameShape( TQGroupBox::Box ); groupBox->setFrameShadow( TQGroupBox::Sunken ); groupBox->setColumnLayout( 0, Qt::Vertical ); - TQGridLayout *boxLayout = new TQGridLayout( groupBox->layout(), 2, + TQGridLayout *boxLayout = new TQGridLayout( groupBox->tqlayout(), 2, 5, spacingHint() ); boxLayout->setColStretch( 1, 1 ); @@ -160,10 +160,10 @@ LDAPSearchDialog::LDAPSearchDialog( TQWidget* parent, const char* name ) TQSize buttonSize; mSearchButton = new TQPushButton( i18n( "Stop" ), groupBox ); - buttonSize = mSearchButton->sizeHint(); + buttonSize = mSearchButton->tqsizeHint(); mSearchButton->setText( i18n( "Search" ) ); - if ( buttonSize.width() < mSearchButton->sizeHint().width() ) - buttonSize = mSearchButton->sizeHint(); + if ( buttonSize.width() < mSearchButton->tqsizeHint().width() ) + buttonSize = mSearchButton->tqsizeHint(); 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( minimumSizeHint() ) ); + resize( TQSize( 600, 400).expandedTo( tqminimumSizeHint() ) ); setButtonText( User1, i18n( "Unselect All" ) ); setButtonText( User2, i18n( "Select All" ) ); diff --git a/libkdepim/linklocator.cpp b/libkdepim/linklocator.cpp index 0ea0fa68..46542f89 100644 --- a/libkdepim/linklocator.cpp +++ b/libkdepim/linklocator.cpp @@ -176,12 +176,12 @@ TQString LinkLocator::getEmailAddress() // determine the local part of the email address int start = mPos - 1; - while ( start >= 0 && mText[start].unicode() < 128 && + while ( start >= 0 && mText[start].tqunicode() < 128 && ( mText[start].isLetterOrNumber() || mText[start] == '@' || // allow @ to find invalid email addresses allowedSpecialChars.find( mText[start] ) != -1 ) ) { if ( mText[start] == '@' ) - return TQString(); // local part contains '@' -> no email address + return TQString(); // local part tqcontains '@' -> no email address --start; } ++start; @@ -200,7 +200,7 @@ TQString LinkLocator::getEmailAddress() mText[end] == '.' || mText[end] == '-' ) ) { if ( mText[end] == '@' ) - return TQString(); // domain part contains '@' -> no email address + return TQString(); // domain part tqcontains '@' -> no email address if ( mText[end] == '.' ) dotPos = QMIN( dotPos, end ); // remember index of first dot in domain ++end; @@ -305,7 +305,7 @@ TQString LinkLocator::convertToHtml(const TQString& plainText, int flags, else hyperlink = str; - str = str.replace('&', "&"); + str = str.tqreplace('&', "&"); result += "<a href=\"" + hyperlink + "\">" + str + "</a>"; x += locator.mPos - start; continue; @@ -319,7 +319,7 @@ TQString LinkLocator::convertToHtml(const TQString& plainText, int flags, // remove the local part from the result (as '&'s have been expanded to // & we have to take care of the 4 additional characters per '&') - result.truncate(result.length() - len - (localPart.contains('&')*4)); + result.truncate(result.length() - len - (localPart.tqcontains('&')*4)); x -= len; result += "<a href=\"mailto:" + str + "\">" + str + "</a>"; @@ -361,7 +361,7 @@ TQString LinkLocator::pngToDataUrl( const TQString & iconPath ) TQByteArray ba = pngFile.readAll(); pngFile.close(); - return TQString::fromLatin1("data:image/png;base64,%1") + return TQString::tqfromLatin1("data:image/png;base64,%1") .arg( KCodecs::base64Encode( ba ) ); } @@ -390,11 +390,11 @@ TQString LinkLocator::getEmoticon() return TQString::null; const TQString smiley = mText.mid( mPos, smileyLen ); - if ( !s_smileyEmoticonNameMap->contains( smiley ) ) + if ( !s_smileyEmoticonNameMap->tqcontains( smiley ) ) return TQString::null; // that's not a (known) smiley TQString htmlRep; - if ( s_smileyEmoticonHTMLCache->contains( smiley ) ) { + if ( s_smileyEmoticonHTMLCache->tqcontains( smiley ) ) { htmlRep = (*s_smileyEmoticonHTMLCache)[smiley]; } else { @@ -403,14 +403,14 @@ TQString LinkLocator::getEmoticon() #if KDE_IS_VERSION( 3, 3, 91 ) const TQString iconPath = locate( "emoticons", EmotIcons::theme() + - TQString::fromLatin1( "/" ) + - imageName + TQString::fromLatin1(".png") ); + TQString::tqfromLatin1( "/" ) + + imageName + TQString::tqfromLatin1(".png") ); #else const TQString iconPath = locate( "data", - TQString::fromLatin1( "kopete/pics/emoticons/" )+ + TQString::tqfromLatin1( "kopete/pics/emoticons/" )+ EmotIcons::theme() + - TQString::fromLatin1( "/" ) + - imageName + TQString::fromLatin1(".png") ); + TQString::tqfromLatin1( "/" ) + + imageName + TQString::tqfromLatin1(".png") ); #endif const TQString dataUrl = pngToDataUrl( iconPath ); diff --git a/libkdepim/linklocator.h b/libkdepim/linklocator.h index 6078fed1..618bc6c8 100644 --- a/libkdepim/linklocator.h +++ b/libkdepim/linklocator.h @@ -123,7 +123,7 @@ public: * - PreserveSpaces, preserves the appearance of * sequences of space and tab * characters in the resulting HTML. - * - ReplaceSmileys, replace text smileys with + * - ReplaceSmileys, tqreplace text smileys with * emoticon images. * - IgnoreUrls, doesn't parse any URLs. * - HighlightText, interprets text highlighting markup diff --git a/libkdepim/maillistdrag.cpp b/libkdepim/maillistdrag.cpp index 434ef5ec..4f4a79bc 100644 --- a/libkdepim/maillistdrag.cpp +++ b/libkdepim/maillistdrag.cpp @@ -30,14 +30,14 @@ using namespace KPIM; -MailSummary::MailSummary( Q_UINT32 serialNumber, TQString messageId, +MailSummary::MailSummary( TQ_UINT32 serialNumber, TQString messageId, TQString subject, TQString from, TQString to, time_t date ) : mSerialNumber( serialNumber ), mMessageId( messageId ), mSubject( subject ), mFrom( from ), mTo( to ), mDate( date ) {} -Q_UINT32 MailSummary::serialNumber() const +TQ_UINT32 MailSummary::serialNumber() const { return mSerialNumber; } @@ -67,7 +67,7 @@ time_t MailSummary::date() return mDate; } -void MailSummary::set( Q_UINT32 serialNumber, TQString messageId, +void MailSummary::set( TQ_UINT32 serialNumber, TQString messageId, TQString subject, TQString from, TQString to, time_t date ) { mSerialNumber = serialNumber; @@ -114,7 +114,7 @@ TQDataStream& operator<< ( TQDataStream &s, MailSummary &d ) TQDataStream& operator>> ( TQDataStream &s, MailSummary &d ) { - Q_UINT32 serialNumber; + TQ_UINT32 serialNumber; TQString messageId, subject, from, to; time_t date; s >> serialNumber; @@ -150,7 +150,7 @@ TQDataStream& operator>> ( TQDataStream &s, MailList &mailList ) bool MailListDrag::decode( TQDropEvent* e, MailList& mailList ) { - TQByteArray payload = e->encodedData( MailListDrag::format() ); + TQByteArray payload = e->tqencodedData( 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::encodedData(const char *mimeType) const +TQByteArray MailListDrag::tqencodedData(const char *mimeType) const { if (TQCString(mimeType) != "message/rfc822") { - return TQStoredDrag::encodedData(mimeType); + return TQStoredDrag::tqencodedData(mimeType); } TQByteArray rc; if (_src) { MailList ml; - TQByteArray enc = TQStoredDrag::encodedData(format()); + TQByteArray enc = TQStoredDrag::tqencodedData(format()); decode(enc, ml); KProgressDialog *dlg = new KProgressDialog(0, 0, TQString::null, i18n("Retrieving and storing messages..."), true); diff --git a/libkdepim/maillistdrag.h b/libkdepim/maillistdrag.h index 92982189..7556cec5 100644 --- a/libkdepim/maillistdrag.h +++ b/libkdepim/maillistdrag.h @@ -47,16 +47,16 @@ namespace KPIM { class KDE_EXPORT MailSummary { public: - MailSummary( Q_UINT32 serialNumber, TQString messageId, TQString subject, + MailSummary( TQ_UINT32 serialNumber, TQString messageId, TQString subject, TQString from, TQString to, time_t date ); MailSummary() {} ~MailSummary() {} /*** Set fields for this mail summary ***/ - void set( Q_UINT32, TQString, TQString, TQString, TQString, time_t ); + void set( TQ_UINT32, TQString, TQString, TQString, TQString, time_t ); /*** KMail unique identification number ***/ - Q_UINT32 serialNumber() const; + TQ_UINT32 serialNumber() const; /*** MD5 checksum of message identification string ***/ TQString messageId(); @@ -74,7 +74,7 @@ public: time_t date(); private: - Q_UINT32 mSerialNumber; + TQ_UINT32 mSerialNumber; TQString mMessageId, mSubject, mFrom, mTo; time_t mDate; }; @@ -88,7 +88,7 @@ public: MailTextSource() {} virtual ~MailTextSource() {} - virtual TQCString text(Q_UINT32 serialNumber) const = 0; + virtual TQCString text(TQ_UINT32 serialNumber) const = 0; }; // Drag and drop object for mails @@ -103,7 +103,7 @@ public: bool provides(const char *mimeType) const; - TQByteArray encodedData(const char *) const; + TQByteArray tqencodedData(const char *) const; /* Reset the list of mail summaries */ void setMailList( MailList ); diff --git a/libkdepim/overlaywidget.cpp b/libkdepim/overlaywidget.cpp index 2e6f703c..1369009f 100644 --- a/libkdepim/overlaywidget.cpp +++ b/libkdepim/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( topLevelWidget(), p ); - // Position in the widget's parentWidget coordinates - TQPoint pParent = parentWidget()->mapFrom( topLevelWidget(), pTopLevel ); + TQPoint pTopLevel = mAlignWidget->mapTo( tqtopLevelWidget(), p ); + // Position in the widget's tqparentWidget coordinates + TQPoint pParent = tqparentWidget()->mapFrom( tqtopLevelWidget(), pTopLevel ); // Move 'this' to that position. move( pParent ); } diff --git a/libkdepim/overlaywidget.h b/libkdepim/overlaywidget.h index d0aed33a..b9918468 100644 --- a/libkdepim/overlaywidget.h +++ b/libkdepim/overlaywidget.h @@ -35,11 +35,11 @@ namespace KPIM { /** - * This is a widget that can align itself with another one, without using a layout, + * This is a widget that can align itself with another one, without using a tqlayout, * so that it can actually be on top of other widgets. - * Currently the only supported type of alignment is "right aligned, on top of the other widget". + * Currently the only supported type of tqalignment is "right aligned, on top of the other widget". * - * OverlayWidget inherits TQHBox for convenience purposes (layout, and frame) + * OverlayWidget inherits TQHBox for convenience purposes (tqlayout, and frame) */ class OverlayWidget : public QHBox { diff --git a/libkdepim/pluginloaderbase.cpp b/libkdepim/pluginloaderbase.cpp index 40a4beb2..9be0ffd0 100644 --- a/libkdepim/pluginloaderbase.cpp +++ b/libkdepim/pluginloaderbase.cpp @@ -58,7 +58,7 @@ namespace KPIM { } const PluginMetaData * PluginLoaderBase::infoForName( const TQString & type ) const { - return mPluginMap.contains( type ) ? &(mPluginMap[type]) : 0 ; + return mPluginMap.tqcontains( type ) ? &(mPluginMap[type]) : 0 ; } @@ -114,7 +114,7 @@ namespace KPIM { void * PluginLoaderBase::mainFunc( const TQString & type, const char * mf_name ) const { - if ( type.isEmpty() || !mPluginMap.contains( type ) ) + if ( type.isEmpty() || !mPluginMap.tqcontains( type ) ) return 0; const TQString libName = mPluginMap[ type ].library; diff --git a/libkdepim/progressdialog.cpp b/libkdepim/progressdialog.cpp index 227e7376..8c0ab889 100644 --- a/libkdepim/progressdialog.cpp +++ b/libkdepim/progressdialog.cpp @@ -84,34 +84,34 @@ void TransactionItemView::resizeContents( int w, int h ) // (handling of TQEvent::LayoutHint in TQScrollView calls this method) //kdDebug(5300) << k_funcinfo << w << "," << h << endl; TQScrollView::resizeContents( w, h ); - // Tell the layout in the parent (progressdialog) that our size changed + // Tell the tqlayout in the parent (progressdialog) that our size changed updateGeometry(); // Resize the parent (progressdialog) - this works but resize horizontally too often - //parentWidget()->adjustSize(); + //tqparentWidget()->adjustSize(); TQApplication::sendPostedEvents( 0, TQEvent::ChildInserted ); TQApplication::sendPostedEvents( 0, TQEvent::LayoutHint ); - TQSize sz = parentWidget()->sizeHint(); - int currentWidth = parentWidget()->width(); + TQSize sz = tqparentWidget()->tqsizeHint(); + int currentWidth = tqparentWidget()->width(); // Don't resize to sz.width() every time when it only reduces a little bit if ( currentWidth < sz.width() || currentWidth > sz.width() + 100 ) currentWidth = sz.width(); - parentWidget()->resize( currentWidth, sz.height() ); + tqparentWidget()->resize( currentWidth, sz.height() ); } -TQSize TransactionItemView::sizeHint() const +TQSize TransactionItemView::tqsizeHint() const { - return minimumSizeHint(); + return tqminimumSizeHint(); } -TQSize TransactionItemView::minimumSizeHint() const +TQSize TransactionItemView::tqminimumSizeHint() const { int f = 2 * frameWidth(); // Make room for a vertical scrollbar in all cases, to avoid a horizontal one - int vsbExt = verticalScrollBar()->sizeHint().width(); - int minw = topLevelWidget()->width() / 3; - int maxh = topLevelWidget()->height() / 2; - TQSize sz( mBigBox->minimumSizeHint() ); + int vsbExt = verticalScrollBar()->tqsizeHint().width(); + int minw = tqtopLevelWidget()->width() / 3; + int maxh = tqtopLevelWidget()->height() / 2; + TQSize sz( mBigBox->tqminimumSizeHint() ); sz.setWidth( QMAX( sz.width(), minw ) + f + vsbExt ); sz.setHeight( QMIN( sz.height(), maxh ) + f ); return sz; @@ -146,7 +146,7 @@ TransactionItem::TransactionItem( TQWidget* parent, { setSpacing( 2 ); setMargin( 2 ); - setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); + tqsetSizePolicy( 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( Qt::RichText ); - mItemLabel->setAlignment( Qt::AlignAuto | Qt::AlignVCenter | Qt::SingleLine ); - h->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); + mItemLabel->tqsetAlignment( Qt::AlignAuto | Qt::AlignVCenter | Qt::SingleLine ); + h->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); + h->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); mSSLLabel = new SSLLabel( h ); - mSSLLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + mSSLLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); mItemStatus = new TQLabel( item->status(), h ); // always interpret the status text as RichText, but disable word wrapping mItemStatus->setTextFormat( Qt::RichText ); - mItemStatus->setAlignment( Qt::AlignAuto | Qt::AlignVCenter | Qt::SingleLine ); - // richtext leads to sizeHint acting as if wrapping was enabled though, + mItemStatus->tqsetAlignment( Qt::AlignAuto | Qt::AlignVCenter | Qt::SingleLine ); + // richtext leads to tqsizeHint acting as if wrapping was enabled though, // so make sure we only ever have the height of one line. - mItemStatus->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ) ); - mItemStatus->setFixedHeight( mItemLabel->sizeHint().height() ); + mItemStatus->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ) ); + mItemStatus->setFixedHeight( mItemLabel->tqsizeHint().height() ); setCrypto( item->usesCrypto() ); if( first ) hideHLine(); } @@ -209,7 +209,7 @@ void TransactionItem::setLabel( const TQString& label ) mItemLabel->setText( label ); } -void TransactionItem::setStatus( const TQString& status ) +void TransactionItem::seStatus( const TQString& status ) { mItemStatus->setText( status ); } @@ -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->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + pbClose->tqsetSizePolicy( 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" ) ); @@ -309,7 +309,7 @@ void ProgressDialog::slotTransactionAdded( ProgressItem *item ) { TransactionItem *parent = 0; if ( item->parent() ) { - if ( mTransactionsToListviewItems.contains( item->parent() ) ) { + if ( mTransactionsToListviewItems.tqcontains( item->parent() ) ) { parent = mTransactionsToListviewItems[ item->parent() ]; parent->addSubTransaction( item ); } @@ -317,7 +317,7 @@ void ProgressDialog::slotTransactionAdded( ProgressItem *item ) const bool first = mTransactionsToListviewItems.empty(); TransactionItem *ti = mScrollView->addTransactionItem( item, first ); if ( ti ) - mTransactionsToListviewItems.replace( item, ti ); + mTransactionsToListviewItems.tqreplace( item, ti ); if ( first && mWasLastShown ) TQTimer::singleShot( 1000, this, TQT_SLOT( slotShow() ) ); @@ -326,7 +326,7 @@ void ProgressDialog::slotTransactionAdded( ProgressItem *item ) void ProgressDialog::slotTransactionCompleted( ProgressItem *item ) { - if ( mTransactionsToListviewItems.contains( item ) ) { + if ( mTransactionsToListviewItems.tqcontains( item ) ) { TransactionItem *ti = mTransactionsToListviewItems[ item ]; mTransactionsToListviewItems.remove( item ); ti->setItemComplete(); @@ -347,7 +347,7 @@ void ProgressDialog::slotTransactionCanceled( ProgressItem* ) void ProgressDialog::slotTransactionProgress( ProgressItem *item, unsigned int progress ) { - if ( mTransactionsToListviewItems.contains( item ) ) { + if ( mTransactionsToListviewItems.tqcontains( item ) ) { TransactionItem *ti = mTransactionsToListviewItems[ item ]; ti->setProgress( progress ); } @@ -356,16 +356,16 @@ void ProgressDialog::slotTransactionProgress( ProgressItem *item, void ProgressDialog::slotTransactionStatus( ProgressItem *item, const TQString& status ) { - if ( mTransactionsToListviewItems.contains( item ) ) { + if ( mTransactionsToListviewItems.tqcontains( item ) ) { TransactionItem *ti = mTransactionsToListviewItems[ item ]; - ti->setStatus( status ); + ti->seStatus( status ); } } void ProgressDialog::slotTransactionLabel( ProgressItem *item, const TQString& label ) { - if ( mTransactionsToListviewItems.contains( item ) ) { + if ( mTransactionsToListviewItems.tqcontains( item ) ) { TransactionItem *ti = mTransactionsToListviewItems[ item ]; ti->setLabel( label ); } @@ -375,7 +375,7 @@ void ProgressDialog::slotTransactionLabel( ProgressItem *item, void ProgressDialog::slotTransactionUsesCrypto( ProgressItem *item, bool value ) { - if ( mTransactionsToListviewItems.contains( item ) ) { + if ( mTransactionsToListviewItems.tqcontains( item ) ) { TransactionItem *ti = mTransactionsToListviewItems[ item ]; ti->setCrypto( value ); } @@ -383,7 +383,7 @@ void ProgressDialog::slotTransactionUsesCrypto( ProgressItem *item, void ProgressDialog::slotTransactionUsesBusyIndicator( KPIM::ProgressItem *item, bool value ) { - if ( mTransactionsToListviewItems.contains( item ) ) { + if ( mTransactionsToListviewItems.tqcontains( item ) ) { TransactionItem *ti = mTransactionsToListviewItems[ item ]; if ( value ) ti->setTotalSteps( 0 ); diff --git a/libkdepim/progressdialog.h b/libkdepim/progressdialog.h index cabcb69a..b9a29e4b 100644 --- a/libkdepim/progressdialog.h +++ b/libkdepim/progressdialog.h @@ -62,8 +62,8 @@ public: TransactionItem* addTransactionItem( ProgressItem *item, bool first ); - TQSize sizeHint() const; - TQSize minimumSizeHint() const; + TQSize tqsizeHint() const; + TQSize tqminimumSizeHint() const; public slots: void slotLayoutFirstItem(); @@ -88,7 +88,7 @@ public: void setProgress( int progress ); void setLabel( const TQString& ); - void setStatus( const TQString& ); + void seStatus( const TQString& ); void setCrypto( bool ); void setTotalSteps( int totalSteps ); diff --git a/libkdepim/progressmanager.cpp b/libkdepim/progressmanager.cpp index 2e5f4d6e..740e6c12 100644 --- a/libkdepim/progressmanager.cpp +++ b/libkdepim/progressmanager.cpp @@ -66,7 +66,7 @@ void ProgressItem::setComplete() void ProgressItem::addChild( ProgressItem *kiddo ) { - mChildren.replace( kiddo, true ); + mChildren.tqreplace( kiddo, true ); } void ProgressItem::removeChild( ProgressItem *kiddo ) @@ -93,7 +93,7 @@ void ProgressItem::cancel() if ( kid->canBeCanceled() ) kid->cancel(); } - setStatus( i18n( "Aborting..." ) ); + seStatus( i18n( "Aborting..." ) ); emit progressItemCanceled( this ); } @@ -111,7 +111,7 @@ void ProgressItem::setLabel( const TQString& v ) emit progressItemLabel( this, mLabel ); } -void ProgressItem::setStatus( const TQString& v ) +void ProgressItem::seStatus( const TQString& v ) { mStatus = v; emit progressItemStatus( this, mStatus ); diff --git a/libkdepim/progressmanager.h b/libkdepim/progressmanager.h index bf284271..47409002 100644 --- a/libkdepim/progressmanager.h +++ b/libkdepim/progressmanager.h @@ -75,7 +75,7 @@ class KDE_EXPORT ProgressItem : public QObject * @p v will be interpreted as rich text, so it might have to be escaped. * @param v The status string. */ - void setStatus( const TQString& v ); + void seStatus( const TQString& v ); /** * @return Whether this item can be cancelled. @@ -131,7 +131,7 @@ class KDE_EXPORT ProgressItem : public QObject * Reset the progress value of this item to 0 and the status string to * the empty string. */ - void reset() { setProgress( 0 ); setStatus( TQString::null ); mCompleted = 0; } + void reset() { setProgress( 0 ); seStatus( TQString::null ); mCompleted = 0; } void cancel(); @@ -358,7 +358,7 @@ class KDE_EXPORT ProgressManager : public QObject * @return the only top level progressitem when there's only one. * Returns 0 if there is no item, or more than one top level item. * Since this is used to calculate the overall progress, it will also return - * 0 if there is an item which uses a busy indicator, since that will invalidate + * 0 if there is an item which uses a busy indicator, since that will tqinvalidate * the overall progress. */ ProgressItem* singleItem() const; diff --git a/libkdepim/qutf7codec.cpp b/libkdepim/qutf7codec.cpp index 11c0db92..bbee2d8c 100644 --- a/libkdepim/qutf7codec.cpp +++ b/libkdepim/qutf7codec.cpp @@ -18,7 +18,7 @@ with any version of Qt by TrollTech AS, Norway. In this case, the use of this plugin doesn't cause the resulting executable to be covered by the GNU General Public License. - This exception does not however invalidate any other reasons why the + This exception does not however tqinvalidate any other reasons why the executable file might be covered by the GNU General Public License. */ @@ -137,10 +137,10 @@ int QUtf7Codec::heuristicContentMatch(const char* chars, int len) const } class QUtf7Decoder : public TQTextDecoder { - // the storage for our unicode char until it's finished + // the storage for our tqunicode char until it's finished ushort uc; // the state of the base64 decoding - // can be 0 (just finished three unicode chars) + // can be 0 (just finished three tqunicode chars) // 1 (have the upper 6 bits of uc already) // 2 (have the upper 12 bits of uc already) // 3 (have the upper 2 bits of uc already) @@ -148,7 +148,7 @@ class QUtf7Decoder : public TQTextDecoder { // 7 (have the upper 10 bits of uc already) // => n (have the upper (n * 6) % 16 bits of uc already) // "stepNo" cycles through all it's values every three - // unicode chars. + // tqunicode chars. char stepNo; // remembers if we are in shifted-sequence mode bool shifted; @@ -183,7 +183,7 @@ public: qWarning("QUtf7Decoder: 8bit char found in input. " "Parser has been re-initialized!"); resetParser(); - result += TQChar::replacement; + result += TQChar::tqreplacement; continue; } @@ -374,8 +374,8 @@ private: // if mayContinue, this char has already been written *t++ = toBase64( outbits | ( u >> 14 ) ); } - *t++ = toBase64( (u & 0x3F00 /* mask top 2 bits */ ) >> 8 ); - *t++ = toBase64( (u & 0x00FC /* mask msbyte */ ) >> 2 ); + *t++ = toBase64( (u & 0x3F00 /* tqmask top 2 bits */ ) >> 8 ); + *t++ = toBase64( (u & 0x00FC /* tqmask msbyte */ ) >> 2 ); // save 2 lowest-significant bits in outbits[5..4] outbits = (u & 0x0003) << 4; break; @@ -462,7 +462,7 @@ public: #endif // source and destination cursor - const TQChar * s = uc.unicode(); + const TQChar * s = uc.tqunicode(); TQCString::Iterator t = result.data(); if ( uc.isNull() ) { @@ -473,7 +473,7 @@ public: // normal operation: for (int i = 0 ; i < len_in_out ; i++/*, checkOutBuf(result,maxreslen,t,i,len_in_out,5)*/ ) { - ushort ch = s[i].unicode(); + ushort ch = s[i].tqunicode(); // // first, we check whether we might get around encoding: diff --git a/libkdepim/qutf7codec.h b/libkdepim/qutf7codec.h index 675692af..116fa02a 100644 --- a/libkdepim/qutf7codec.h +++ b/libkdepim/qutf7codec.h @@ -18,7 +18,7 @@ with any version of Qt by TrollTech AS, Norway. In this case, the use of this plugin doesn't cause the resulting executable to be covered by the GNU General Public License. - This exception does not however invalidate any other reasons why the + This exception does not however tqinvalidate any other reasons why the executable file might be covered by the GNU General Public License. */ diff --git a/libkdepim/qutf7codecplugin.cpp b/libkdepim/qutf7codecplugin.cpp index e6dcf7c6..27b70682 100644 --- a/libkdepim/qutf7codecplugin.cpp +++ b/libkdepim/qutf7codecplugin.cpp @@ -18,7 +18,7 @@ with any version of Qt by TrollTech AS, Norway. In this case, the use of this plugin doesn't cause the resulting executable to be covered by the GNU General Public License. - This exception does not however invalidate any other reasons why the + This exception does not however tqinvalidate any other reasons why the executable file might be covered by the GNU General Public License. */ diff --git a/libkdepim/recentaddresses.cpp b/libkdepim/recentaddresses.cpp index a8e7e76b..80fe3912 100644 --- a/libkdepim/recentaddresses.cpp +++ b/libkdepim/recentaddresses.cpp @@ -162,11 +162,11 @@ RecentAddressDialog::RecentAddressDialog( TQWidget *parent, const char *name ) parent, name, true ) { TQWidget *page = plainPage(); - TQVBoxLayout *layout = new TQVBoxLayout( page, 0, spacingHint() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( page, 0, spacingHint() ); mEditor = new KEditListBox( i18n( "Recent Addresses" ), page, "", false, KEditListBox::Add | KEditListBox::Remove ); - layout->addWidget( mEditor ); + tqlayout->addWidget( mEditor ); } void RecentAddressDialog::setAddresses( const TQStringList &addrs ) diff --git a/libkdepim/sendsmsdialog.cpp b/libkdepim/sendsmsdialog.cpp index 93671a34..7011c712 100644 --- a/libkdepim/sendsmsdialog.cpp +++ b/libkdepim/sendsmsdialog.cpp @@ -32,19 +32,19 @@ SendSMSDialog::SendSMSDialog( const TQString &recipientName, TQWidget *parent, c { TQWidget *page = plainPage(); - TQGridLayout *layout = new TQGridLayout( page, 3, 3, marginHint(), spacingHint() ); + TQGridLayout *tqlayout = new TQGridLayout( page, 3, 3, marginHint(), spacingHint() ); - layout->addWidget( new TQLabel( i18n( "Message" ), page ), 0, 0 ); + tqlayout->addWidget( new TQLabel( i18n( "Message" ), page ), 0, 0 ); mMessageLength = new TQLabel( "0/160", page ); - mMessageLength->setAlignment( Qt::AlignRight ); - layout->addWidget( mMessageLength, 0, 2 ); + mMessageLength->tqsetAlignment( Qt::AlignRight ); + tqlayout->addWidget( mMessageLength, 0, 2 ); mText = new TQTextEdit( page ); - layout->addMultiCellWidget( mText, 1, 1, 0, 2 ); + tqlayout->addMultiCellWidget( mText, 1, 1, 0, 2 ); - layout->addWidget( new TQLabel( i18n( "Recipient:" ), page ), 2, 0 ); - layout->addWidget( new TQLabel( recipientName, page ), 2, 2 ); + tqlayout->addWidget( new TQLabel( i18n( "Recipient:" ), page ), 2, 0 ); + tqlayout->addWidget( new TQLabel( recipientName, page ), 2, 2 ); setButtonText( Ok, i18n( "Send" ) ); diff --git a/libkdepim/spellingfilter.cpp b/libkdepim/spellingfilter.cpp index cc94968d..e57745e5 100644 --- a/libkdepim/spellingfilter.cpp +++ b/libkdepim/spellingfilter.cpp @@ -89,7 +89,7 @@ void SpellingFilter::TextCensor::censorQuotations(const TQString& quotePrefix) int len = mPos - start; TQString spaces; spaces.fill(' ', len); - mText.replace(start, len, spaces); + mText.tqreplace(start, len, spaces); //kdDebug(5006) << "censored quotation [" // << start << ", " << mPos << ")" << endl; @@ -116,7 +116,7 @@ void SpellingFilter::TextCensor::censorUrls() // Replace url with spaces url.fill(' '); - mText.replace(start, url.length(), url); + mText.tqreplace(start, url.length(), url); //kdDebug(5006) << "censored url [" // << start << ", " << mPos << ")" << endl; @@ -141,7 +141,7 @@ void SpellingFilter::TextCensor::censorEmailAddresses() // Replace address with spaces address.fill(' '); - mText.replace(start, address.length(), address); + mText.tqreplace(start, address.length(), address); //kdDebug(5006) << "censored addr [" // << start << ", "<< mPos << ")" << endl; @@ -162,7 +162,7 @@ void SpellingFilter::TextCensor::censorString(const TQString& s) // Replace string with spaces TQString spaces; spaces.fill(' ', s.length()); - mText.replace(mPos, s.length(), spaces); + mText.tqreplace(mPos, s.length(), spaces); mPos += s.length(); //kdDebug(5006) << "censored string [" diff --git a/libkdepim/statusbarprogresswidget.cpp b/libkdepim/statusbarprogresswidget.cpp index a7b240ea..16637663 100644 --- a/libkdepim/statusbarprogresswidget.cpp +++ b/libkdepim/statusbarprogresswidget.cpp @@ -67,7 +67,7 @@ StatusbarProgressWidget::StatusbarProgressWidget( ProgressDialog* progressDialog box = new TQHBoxLayout( this, 0, 0 ); m_pButton = new TQPushButton( this ); - m_pButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, + m_pButton->tqsetSizePolicy( 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::null, this ); - m_pLabel->setAlignment( AlignHCenter | AlignVCenter ); + m_pLabel->tqsetAlignment( AlignHCenter | AlignVCenter ); m_pLabel->installEventFilter( this ); m_pLabel->setMinimumWidth( w ); stack->addWidget( m_pLabel, 2 ); m_pButton->setMaximumHeight( fontMetrics().height() ); - setMinimumWidth( minimumSizeHint().width() ); + setMinimumWidth( tqminimumSizeHint().width() ); mode = None; setMode(); diff --git a/libkdepim/tests/test_kregexp.cpp b/libkdepim/tests/test_kregexp.cpp index a44e3be0..0644bbba 100644 --- a/libkdepim/tests/test_kregexp.cpp +++ b/libkdepim/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::fromLatin1("Fun stuff"), - TQString::fromLatin1("[fun] ")); + TQString res = reg.tqreplace(TQString::tqfromLatin1("Fun stuff"), + TQString::tqfromLatin1("[fun] ")); kdDebug() << res << endl; } diff --git a/libkdepim/tests/testdateedit.cpp b/libkdepim/tests/testdateedit.cpp index 993967cb..e0d1d732 100644 --- a/libkdepim/tests/testdateedit.cpp +++ b/libkdepim/tests/testdateedit.cpp @@ -34,10 +34,10 @@ DateEdit::DateEdit( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - TQVBoxLayout *layout = new TQVBoxLayout( this ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); KDateEdit *edit = new KDateEdit( this ); - layout->addWidget( edit ); + tqlayout->addWidget( edit ); connect( edit, TQT_SIGNAL( dateChanged( const TQDate& ) ), this, TQT_SLOT( dateChanged( const TQDate& ) ) ); diff --git a/libkdepim/tests/testutf7encoder.cpp b/libkdepim/tests/testutf7encoder.cpp index 925bab21..04ed8f70 100644 --- a/libkdepim/tests/testutf7encoder.cpp +++ b/libkdepim/tests/testutf7encoder.cpp @@ -9,7 +9,7 @@ void main( int argc, char * argv[] ) { TQTextEncoder * enc; - TQString arg = TQString::fromLatin1( argv[1] ); + TQString arg = TQString::tqfromLatin1( argv[1] ); int len; cout << "Original string:\n" |