diff options
Diffstat (limited to 'libkdepim')
167 files changed, 1151 insertions, 1075 deletions
diff --git a/libkdepim/addresseediffalgo.cpp b/libkdepim/addresseediffalgo.cpp index 361ec631f..1de2dddcc 100644 --- a/libkdepim/addresseediffalgo.cpp +++ b/libkdepim/addresseediffalgo.cpp @@ -135,12 +135,12 @@ void AddresseeDiffAlgo::diffList( const TQString &id, const TQValueList<L> &left, const TQValueList<L> &right ) { for ( uint i = 0; i < left.count(); ++i ) { - if ( right.find( left[ i ] ) == right.end() ) + if ( right.tqfind( left[ i ] ) == right.end() ) additionalLeftField( id, toString( left[ i ] ) ); } for ( uint i = 0; i < right.count(); ++i ) { - if ( left.find( right[ i ] ) == left.end() ) + if ( left.tqfind( right[ i ] ) == left.end() ) additionalRightField( id, toString( right[ i ] ) ); } } diff --git a/libkdepim/addresseeemailselection.cpp b/libkdepim/addresseeemailselection.cpp index f9f101607..481fc1554 100644 --- a/libkdepim/addresseeemailselection.cpp +++ b/libkdepim/addresseeemailselection.cpp @@ -53,7 +53,7 @@ TQString AddresseeEmailSelection::fieldTitle( uint index ) const return i18n( "Bcc" ); break; default: - return TQString::null; + return TQString(); } } @@ -195,7 +195,7 @@ TQString AddresseeEmailSelection::addressBookTitle( uint index ) const if ( index == 0 ) return i18n( "Recent Addresses" ); else - return TQString::null; + return TQString(); } KABC::Addressee::List AddresseeEmailSelection::addressBookContent( uint index ) const diff --git a/libkdepim/addresseelineedit.cpp b/libkdepim/addresseelineedit.cpp index 243b66086..0d86fad44 100644 --- a/libkdepim/addresseelineedit.cpp +++ b/libkdepim/addresseelineedit.cpp @@ -109,9 +109,9 @@ static bool itemIsHeader( const TQListBoxItem* item ) -AddresseeLineEdit::AddresseeLineEdit( TQWidget* parent, bool useCompletion, +AddresseeLineEdit::AddresseeLineEdit( TQWidget* tqparent, bool useCompletion, const char *name ) - : ClickLineEdit( parent, TQString::null, name ), DCOPObject( newLineEditDCOPObjectName() ), + : ClickLineEdit( tqparent, TQString(), name ), DCOPObject( newLineEditDCOPObjectName() ), m_useSemiColonAsSeparator( false ), m_allowDistLists( true ) { m_useCompletion = useCompletion; @@ -285,12 +285,12 @@ void AddresseeLineEdit::insert( const TQString &t ) KURL url( newText ); newText = url.path(); } - else if ( newText.find(" at ") != -1 ) { + else if ( newText.tqfind(" at ") != -1 ) { // Anti-spam stuff newText.tqreplace( " at ", "@" ); newText.tqreplace( " dot ", "." ); } - else if ( newText.find("(at)") != -1 ) { + else if ( newText.tqfind("(at)") != -1 ) { newText.tqreplace( TQRegExp("\\s*\\(at\\)\\s*"), "@" ); } @@ -310,7 +310,7 @@ void AddresseeLineEdit::insert( const TQString &t ) eot--; } if ( eot == 0 ) { - contents = TQString::null; + contents = TQString(); } else if ( pos >= eot ) { if ( contents[ eot - 1 ] == ',' ) { eot--; @@ -365,7 +365,7 @@ void AddresseeLineEdit::dropEvent( TQDropEvent *e ) while ( ( eot > 0 ) && contents[ eot - 1 ].isSpace() ) eot--; if ( eot == 0 ) - contents = TQString::null; + contents = TQString(); else if ( contents[ eot - 1 ] == ',' ) { eot--; contents.truncate( eot ); @@ -388,7 +388,7 @@ void AddresseeLineEdit::dropEvent( TQDropEvent *e ) return; } } else { - // Let's see if this drop tqcontains a comma separated list of emails + // Let's see if this drop contains a comma separated list of emails TQString dropData = TQString::fromUtf8( e->tqencodedData( "text/plain" ) ); TQStringList addrs = splitEmailAddrList( dropData ); if ( addrs.count() > 0 ) { @@ -482,7 +482,7 @@ void AddresseeLineEdit::doCompletion( bool ctrlT ) //if only our \" is left, remove it since user has not typed it either if ( m_searchExtended && m_searchString == "\"" ){ m_searchExtended = false; - m_searchString = TQString::null; + m_searchString = TQString(); setText( m_previousAddresses ); break; } @@ -567,7 +567,7 @@ void AddresseeLineEdit::loadContacts() KABC::Resource::Iterator it; for ( it = resource->begin(); it != resource->end(); ++it ) { TQString uid = (*it).uid(); - TQMap<TQString, TQString>::const_iterator wit = uidToResourceMap.find( uid ); + TQMap<TQString, TQString>::const_iterator wit = uidToResourceMap.tqfind( uid ); const TQString subresourceLabel = resabc->subresourceLabel( *wit ); const int weight = ( wit != uidToResourceMap.end() ) ? resabc->subresourceCompletionWeight( *wit ) : 80; const int idx = addCompletionSource( subresourceLabel, weight ); @@ -641,7 +641,7 @@ void AddresseeLineEdit::addContact( const KABC::Addressee& addr, int weight, int const TQString givenName = addr.givenName(); const TQString familyName= addr.familyName(); const TQString nickName = addr.nickName(); - const TQString domain = email.mid( email.find( '@' ) + 1 ); + const TQString domain = email.mid( email.tqfind( '@' ) + 1 ); TQString fullEmail = addr.fullEmail( email ); //TODO: let user decide what fields to use in lookup, e.g. company, city, ... @@ -757,10 +757,10 @@ void AddresseeLineEdit::addContact( const KABC::Addressee& addr, int weight, int void AddresseeLineEdit::addCompletionItem( const TQString& string, int weight, int completionItemSource, const TQStringList * keyWords ) { // Check if there is an exact match for item already, and use the max weight if so. - // Since there's no way to get the information from KCompletion, we have to keep our own QMap - CompletionItemsMap::iterator it = s_completionItemMap->find( string ); + // Since there's no way to get the information from KCompletion, we have to keep our own TQMap + CompletionItemsMap::iterator it = s_completionItemMap->tqfind( string ); if ( it != s_completionItemMap->end() ) { - weight = QMAX( ( *it ).first, weight ); + weight = TQMAX( ( *it ).first, weight ); ( *it ).first = weight; } else { s_completionItemMap->insert( string, qMakePair( weight, completionItemSource ) ); @@ -900,7 +900,7 @@ void AddresseeLineEdit::setCompletedItems( const TQStringList& items, bool autoS if ( autoSuggest ) { - int index = items.first().find( m_searchString ); + int index = items.first().tqfind( m_searchString ); TQString newText = items.first().mid( index ); setUserSelection(false); setCompletedText(newText,true); @@ -991,7 +991,7 @@ void AddresseeLineEdit::updateSearchString() m_previousAddresses = m_searchString.left( n ); m_searchString = m_searchString.mid( n ).stripWhiteSpace(); } else { - m_previousAddresses = TQString::null; + m_previousAddresses = TQString(); } } @@ -1020,7 +1020,7 @@ KCompletion::CompOrder KPIM::AddresseeLineEdit::completionOrder() int KPIM::AddresseeLineEdit::addCompletionSource( const TQString &source, int weight ) { - TQMap<TQString,int>::iterator it = s_completionSourceWeights->find( source ); + TQMap<TQString,int>::iterator it = s_completionSourceWeights->tqfind( source ); if ( it == s_completionSourceWeights->end() ) s_completionSourceWeights->insert( source, weight ); else @@ -1047,7 +1047,7 @@ bool KPIM::AddresseeLineEdit::eventFilter(TQObject *obj, TQEvent *e) TQListBoxItem *item = completionBox()->itemAt( me->pos() ); if ( !item ) { // In the case of a mouse move outside of the box we don't want - // the parent to fuzzy select a header by mistake. + // the tqparent to fuzzy select a header by mistake. bool eat = e->type() == TQEvent::MouseMove; return eat; } @@ -1061,7 +1061,7 @@ bool KPIM::AddresseeLineEdit::eventFilter(TQObject *obj, TQEvent *e) } else { // if we are not on one of the group heading, make sure the item // below or above is selected, not the heading, inadvertedly, due - // to fuzzy auto-selection from QListBox + // to fuzzy auto-selection from TQListBox completionBox()->setCurrentItem( item ); completionBox()->setSelected( completionBox()->index( item ), true ); if ( e->type() == TQEvent::MouseMove ) @@ -1145,7 +1145,7 @@ bool KPIM::AddresseeLineEdit::eventFilter(TQObject *obj, TQEvent *e) /// first, find the header of the current section TQListBoxItem *myHeader = 0; const int iterationstep = ke->key() == Key_Tab ? 1 : -1; - int i = QMIN( QMAX( currentIndex - iterationstep, 0 ), completionBox()->count() - 1 ); + int i = TQMIN( TQMAX( currentIndex - iterationstep, 0 ), completionBox()->count() - 1 ); while ( i>=0 ) { if ( itemIsHeader( completionBox()->item(i) ) ) { myHeader = completionBox()->item( i ); @@ -1228,7 +1228,7 @@ const TQStringList KPIM::AddresseeLineEdit::getAdjustedCompletionItems( bool ful TQMap<int, TQStringList> sections; TQStringList sortedItems; for ( TQStringList::Iterator it = items.begin(); it != items.end(); ++it, ++i ) { - CompletionItemsMap::const_iterator cit = s_completionItemMap->find(*it); + CompletionItemsMap::const_iterator cit = s_completionItemMap->tqfind(*it); if ( cit == s_completionItemMap->end() ) continue; int idx = (*cit).second; @@ -1236,7 +1236,7 @@ const TQStringList KPIM::AddresseeLineEdit::getAdjustedCompletionItems( bool ful if ( s_completion->order() == KCompletion::Weighted ) { if ( lastSourceIndex == -1 || lastSourceIndex != idx ) { const TQString sourceLabel( (*s_completionSources)[idx] ); - if ( sections.find(idx) == sections.end() ) { + if ( sections.tqfind(idx) == sections.end() ) { items.insert( it, sourceLabel ); } lastSourceIndex = idx; diff --git a/libkdepim/addresseelineedit.h b/libkdepim/addresseelineedit.h index 86d8d8db2..416af1671 100644 --- a/libkdepim/addresseelineedit.h +++ b/libkdepim/addresseelineedit.h @@ -45,7 +45,7 @@ namespace KPIM { class LdapSearch; class LdapResult; typedef TQValueList<LdapResult> LdapResultList; -typedef TQMap< TQString, QPair<int,int> > CompletionItemsMap; +typedef TQMap< TQString, TQPair<int,int> > CompletionItemsMap; } namespace KPIM { @@ -54,9 +54,10 @@ class KDE_EXPORT AddresseeLineEdit : public ClickLineEdit, public DCOPObject { K_DCOP Q_OBJECT + TQ_OBJECT public: - AddresseeLineEdit( TQWidget* parent, bool useCompletion = true, + AddresseeLineEdit( TQWidget* tqparent, bool useCompletion = true, const char *name = 0L); virtual ~AddresseeLineEdit(); diff --git a/libkdepim/addresseeselector.cpp b/libkdepim/addresseeselector.cpp index 65e34985d..c7e378179 100644 --- a/libkdepim/addresseeselector.cpp +++ b/libkdepim/addresseeselector.cpp @@ -79,7 +79,7 @@ TQStringList AddresseeSelector::AddressBookManager::titles() const void AddresseeSelector::AddressBookManager::addResource( KABC::Resource *resource ) { - if ( mResources.find( resource ) == mResources.end() ) + if ( mResources.tqfind( resource ) == mResources.end() ) mResources.append( resource ); } @@ -184,12 +184,12 @@ uint SelectionItem::index() const } -class SelectionViewItem : public QListViewItem +class SelectionViewItem : public TQListViewItem { public: - SelectionViewItem( TQListView *parent, Selection *selection, + SelectionViewItem( TQListView *tqparent, Selection *selection, SelectionItem *item ) - : TQListViewItem( parent, "" ), mSelection( selection ), mItem( item ) + : TQListViewItem( tqparent, "" ), mSelection( selection ), mItem( item ) { if ( mItem->distributionList() == 0 ) mIcon = mSelection->itemIcon( mItem->addressee(), mItem->index() ); @@ -205,7 +205,7 @@ class SelectionViewItem : public QListViewItem else return mSelection->distributionListText( mItem->distributionList() ); } else - return TQString::null; + return TQString(); } const TQPixmap* pixmap( int column ) const @@ -224,8 +224,8 @@ class SelectionViewItem : public QListViewItem TQPixmap mIcon; }; -AddresseeSelector::AddresseeSelector( Selection *selection, TQWidget *parent, const char *name ) - : TQWidget( parent, name ), mSelection( selection ), mManager( 0 ) +AddresseeSelector::AddresseeSelector( Selection *selection, TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ), mSelection( selection ), mManager( 0 ) { mMoveMapper = new TQSignalMapper( this ); mRemoveMapper = new TQSignalMapper( this ); @@ -303,7 +303,7 @@ void AddresseeSelector::initGUI() mRemoveMapper->setMapping( listView, i ); TQVBoxLayout *buttonLayout = new TQVBoxLayout( this ); - buttonLayout->tqsetAlignment( Qt::AlignBottom ); + buttonLayout->tqsetAlignment( TQt::AlignBottom ); tqlayout->addLayout( buttonLayout, row, 1 ); // move button @@ -561,8 +561,8 @@ void AddresseeSelector::reloadAddressBook() AddresseeSelectorDialog::AddresseeSelectorDialog( Selection *selection, - TQWidget *parent, const char *name ) - : KDialogBase( Plain, "", Ok | Cancel, Ok, parent, name, true ) + TQWidget *tqparent, const char *name ) + : KDialogBase( Plain, "", Ok | Cancel, Ok, tqparent, name, true ) { TQFrame *frame = plainPage(); TQVBoxLayout *tqlayout = new TQVBoxLayout( frame ); diff --git a/libkdepim/addresseeselector.h b/libkdepim/addresseeselector.h index e566d4e5e..2b4771a19 100644 --- a/libkdepim/addresseeselector.h +++ b/libkdepim/addresseeselector.h @@ -163,13 +163,14 @@ class SelectionItem TQBitArray mField; }; -class KDE_EXPORT AddresseeSelector : public QWidget +class KDE_EXPORT AddresseeSelector : public TQWidget { Q_OBJECT + TQ_OBJECT public: AddresseeSelector( Selection *selection, - TQWidget *parent, const char *name = 0 ); + TQWidget *tqparent, const char *name = 0 ); ~AddresseeSelector(); /** @@ -215,10 +216,11 @@ class KDE_EXPORT AddresseeSelector : public QWidget class KDE_EXPORT AddresseeSelectorDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: AddresseeSelectorDialog( Selection *selection, - TQWidget *parent = 0, const char *name = 0 ); + TQWidget *tqparent = 0, const char *name = 0 ); protected slots: void accept(); diff --git a/libkdepim/addresseeview.cpp b/libkdepim/addresseeview.cpp index d5b3e6e27..d8ead42b2 100644 --- a/libkdepim/addresseeview.cpp +++ b/libkdepim/addresseeview.cpp @@ -50,9 +50,9 @@ using namespace KPIM; -AddresseeView::AddresseeView( TQWidget *parent, const char *name, +AddresseeView::AddresseeView( TQWidget *tqparent, const char *name, KConfig *config ) - : KTextBrowser( parent, name ), mDefaultConfig( false ), mImageJob( 0 ), + : KTextBrowser( tqparent, name ), mDefaultConfig( false ), mImageJob( 0 ), mLinkMask( AddressLinks | EmailLinks | PhoneLinks | URLLinks | IMLinks | CustomFields ) { setWrapPolicy( TQTextEdit::AtWordBoundary ); @@ -359,7 +359,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr customEntry.remove( "KADDRESSBOOK-X-" ); customEntry.remove( "KADDRESSBOOK-" ); - int pos = customEntry.find( ':' ); + int pos = customEntry.tqfind( ':' ); TQString key = customEntry.left( pos ); const TQString value = customEntry.mid( pos + 1 ); @@ -367,7 +367,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr if ( key == "BlogFeed" || key == "IMAddress" ) continue; - const TQMap<TQString, TQString>::ConstIterator keyIt = titleMap.find( key ); + const TQMap<TQString, TQString>::ConstIterator keyIt = titleMap.tqfind( key ); if ( keyIt != titleMap.end() ) key = keyIt.data(); @@ -399,16 +399,16 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr imgSrc = pixmapAsDataUrl( proxy->presenceIcon( addr.uid() ) ); // make the status a link, if required - TQString imStatus; + TQString imtqStatus; if ( linkMask & IMLinks ) - imStatus = TQString::tqfromLatin1( "<a href=\"im:\"><img src=\"%1\"> (%2)</a>" ); + imtqStatus = TQString::tqfromLatin1( "<a href=\"im:\"><img src=\"%1\"> (%2)</a>" ); else - imStatus = TQString::tqfromLatin1( "<img src=\"%1\"> (%2)" ); + imtqStatus = TQString::tqfromLatin1( "<img src=\"%1\"> (%2)" ); // append our status to the rest of the dynamic part of the addressee dynamicPart += rowFmtStr .arg( i18n( "Presence" ) ) - .arg( imStatus + .arg( imtqStatus .arg( imgSrc ) .arg( proxy->presenceString( addr.uid() ) ) ); @@ -495,7 +495,7 @@ TQString AddresseeView::pixmapAsDataUrl( const TQPixmap& pixmap ) void AddresseeView::updateView() { // clear view - setText( TQString::null ); + setText( TQString() ); if ( mAddressee.isEmpty() ) return; @@ -575,9 +575,9 @@ void AddresseeView::urlClicked( const TQString &url ) void AddresseeView::emailClicked( const TQString &email ) { if ( email.startsWith( "mailto:" ) ) - kapp->invokeMailer( email.mid( 7 ), TQString::null ); + kapp->invokeMailer( email.mid( 7 ), TQString() ); else - kapp->invokeMailer( email, TQString::null ); + kapp->invokeMailer( email, TQString() ); } void AddresseeView::phoneNumberClicked( const TQString &number ) diff --git a/libkdepim/addresseeview.h b/libkdepim/addresseeview.h index 74c3a657b..09e17887d 100644 --- a/libkdepim/addresseeview.h +++ b/libkdepim/addresseeview.h @@ -43,6 +43,7 @@ namespace KPIM { class KDE_EXPORT AddresseeView : public KTextBrowser { Q_OBJECT + TQ_OBJECT public: /** Constructor. @@ -50,7 +51,7 @@ class KDE_EXPORT AddresseeView : public KTextBrowser @param config The config object where the settings are stored which fields will be shown. */ - AddresseeView( TQWidget *parent = 0, const char *name = 0, + AddresseeView( TQWidget *tqparent = 0, const char *name = 0, KConfig *config = 0 ); ~AddresseeView(); diff --git a/libkdepim/addressesdialog.cpp b/libkdepim/addressesdialog.cpp index 5807b0d68..b7bea2369 100644 --- a/libkdepim/addressesdialog.cpp +++ b/libkdepim/addressesdialog.cpp @@ -91,9 +91,9 @@ struct AddressesDialog::AddressesDialogPrivate { }; // privates end -AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *parent, const KABC::Addressee& addr, +AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *tqparent, const KABC::Addressee& addr, int emailIndex ) - : TQObject( 0 ), KListViewItem( parent, addr.realName(), + : TQObject( 0 ), KListViewItem( tqparent, addr.realName(), ( emailIndex == 0 ? addr.preferredEmail() : addr.emails()[ emailIndex ] ) ) { d = new AddresseeViewItemPrivate; @@ -120,17 +120,17 @@ AddresseeViewItem::AddresseeViewItem( KListView *lv, const TQString& name, Categ d->category = cat; } -AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *parent, const TQString& name, +AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *tqparent, const TQString& name, const KABC::Addressee::List &lst ) - : TQObject(0), KListViewItem( parent, name, i18n("<group>") ) + : TQObject(0), KListViewItem( tqparent, name, i18n("<group>") ) { d = new AddresseeViewItemPrivate; d->category = FilledGroup; d->addresses = lst; } -AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *parent, const TQString& name ) - : TQObject(0), KListViewItem( parent, name, i18n("<group>") ) +AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *tqparent, const TQString& name ) + : TQObject(0), KListViewItem( tqparent, name, i18n("<group>") ) { d = new AddresseeViewItemPrivate; d->category = DistList; @@ -162,13 +162,13 @@ AddresseeViewItem::category() const return d->category; } -QString +TQString AddresseeViewItem::name() const { return text(0); } -QString +TQString AddresseeViewItem::email() const { return text(1); @@ -353,7 +353,7 @@ AddressesDialog::setShowBCC( bool b ) d->ui->mBCCButton->setShown( b ); } -QStringList +TQStringList AddressesDialog::to() const { TQStringList emails = allDistributionLists( d->toItem ); @@ -363,7 +363,7 @@ AddressesDialog::to() const return emails; } -QStringList +TQStringList AddressesDialog::cc() const { TQStringList emails = allDistributionLists( d->ccItem ); @@ -373,7 +373,7 @@ AddressesDialog::cc() const return emails; } -QStringList +TQStringList AddressesDialog::bcc() const { TQStringList emails = allDistributionLists( d->bccItem ); @@ -402,7 +402,7 @@ AddressesDialog::allToAddressesNoDuplicates() const TQValueList<KPIM::DistributionList::Entry>::ConstIterator eit; for( eit = eList.begin(); eit != eList.end(); ++eit ) { KABC::Addressee a = (*eit).addressee; - if ( !a.preferredEmail().isEmpty() && aList.find( a ) == aList.end() ) { + if ( !a.preferredEmail().isEmpty() && aList.tqfind( a ) == aList.end() ) { aList.append( a ) ; } } @@ -415,7 +415,7 @@ AddressesDialog::allToAddressesNoDuplicates() const TQValueList<KABC::DistributionList::Entry>::ConstIterator eit; for( eit = eList.begin(); eit != eList.end(); ++eit ) { KABC::Addressee a = (*eit).addressee; - if ( !a.preferredEmail().isEmpty() && aList.find( a ) == aList.end() ) { + if ( !a.preferredEmail().isEmpty() && aList.tqfind( a ) == aList.end() ) { aList.append( a ) ; } } @@ -437,19 +437,19 @@ AddressesDialog::bccAddresses() const } -QStringList +TQStringList AddressesDialog::toDistributionLists() const { return allDistributionLists( d->toItem ); } -QStringList +TQStringList AddressesDialog::ccDistributionLists() const { return allDistributionLists( d->ccItem ); } -QStringList +TQStringList AddressesDialog::bccDistributionLists() const { return allDistributionLists( d->bccItem ); @@ -544,12 +544,12 @@ AddressesDialog::availableAddressSelected( AddresseeViewItem* item, bool selecte void AddressesDialog::selectedAddressSelected( AddresseeViewItem* item, bool selected ) { - // we have to avoid that a parent and a child is selected together + // we have to avoid that a tqparent and a child is selected together // because in this case we get a double object deletion ( program crashes ) // when removing the selected items from list - AddresseeViewItem* parent = static_cast<AddresseeViewItem*>(((TQListViewItem*)item)->parent()); - if ( parent && selected ) - parent->setSelected( false ); + AddresseeViewItem* tqparent = static_cast<AddresseeViewItem*>(((TQListViewItem*)item)->tqparent()); + if ( tqparent && selected ) + tqparent->setSelected( false ); if (selected) { selectedSelectedAddresses.append(item); @@ -662,10 +662,10 @@ AddressesDialog::addAddresseeToSelected( const KABC::Addressee& addr, AddresseeV } void -AddressesDialog::addAddresseesToSelected( AddresseeViewItem *parent, +AddressesDialog::addAddresseesToSelected( AddresseeViewItem *tqparent, const TQPtrList<AddresseeViewItem>& addresses ) { - Q_ASSERT( parent ); + Q_ASSERT( tqparent ); TQPtrListIterator<AddresseeViewItem> itr( addresses ); @@ -678,7 +678,7 @@ AddressesDialog::addAddresseesToSelected( AddresseeViewItem *parent, AddresseeViewItem* address = itr.current(); ++itr; - if (selectedToAvailableMapping.find(address) != 0) + if (selectedToAvailableMapping.tqfind(address) != 0) { continue; } @@ -686,15 +686,15 @@ AddressesDialog::addAddresseesToSelected( AddresseeViewItem *parent, AddresseeViewItem* newItem = 0; if (address->category() == AddresseeViewItem::Entry) { - newItem = new AddresseeViewItem( parent, address->addressee() ); + newItem = new AddresseeViewItem( tqparent, address->addressee() ); } else if (address->category() == AddresseeViewItem::DistList) { - newItem = new AddresseeViewItem( parent, address->name() ); + newItem = new AddresseeViewItem( tqparent, address->name() ); } else { - newItem = new AddresseeViewItem( parent, address->name(), allAddressee( address ) ); + newItem = new AddresseeViewItem( tqparent, address->name(), allAddressee( address ) ); } address->setSelected( false ); @@ -705,10 +705,10 @@ AddressesDialog::addAddresseesToSelected( AddresseeViewItem *parent, this, TQT_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); } - parent->setOpen( true ); + tqparent->setOpen( true ); } -QStringList +TQStringList AddressesDialog::entryToString( const KABC::Addressee::List& l ) const { TQStringList entries; @@ -819,7 +819,7 @@ AddressesDialog::removeEntry() resetCC = true; else if( d->bccItem == item ) resetBCC = true; - // we may only append parent items + // we may only append tqparent items unmapSelectedAddress(item); lst.append( item ); } @@ -854,7 +854,7 @@ AddressesDialog::removeEntry() // copied from kabcore.cpp :( // KDE4: should be in libkabc I think -static KABC::Resource *requestResource( KABC::AddressBook* abook, TQWidget *parent ) +static KABC::Resource *requestResource( KABC::AddressBook* abook, TQWidget *tqparent ) { TQPtrList<KABC::Resource> kabcResources = abook->resources(); @@ -870,7 +870,7 @@ static KABC::Resource *requestResource( KABC::AddressBook* abook, TQWidget *pare } } - KRES::Resource *res = KRES::SelectDialog::getResource( kresResources, parent ); + KRES::Resource *res = KRES::SelectDialog::getResource( kresResources, tqparent ); return static_cast<KABC::Resource*>( res ); } #endif @@ -894,7 +894,7 @@ AddressesDialog::saveAs() bool ok = false; TQString name = KInputDialog::getText( i18n("New Distribution List"), i18n("Please enter name:"), - TQString::null, &ok, + TQString(), &ok, this ); if ( !ok || name.isEmpty() ) return; @@ -1002,11 +1002,11 @@ AddressesDialog::filterChanged( const TQString& txt ) if ( item->category() == AddresseeViewItem::Entry ) { bool matches = item->matches( txt ); item->setVisible( matches ); - TQListViewItem *parent = static_cast<TQListViewItem*>( item )->parent(); - if ( matches && parent ) { - if ( parent == d->personal ) { + TQListViewItem *tqparent = static_cast<TQListViewItem*>( item )->tqparent(); + if ( matches && tqparent ) { + if ( tqparent == d->personal ) { personalVisible++; - } else if ( parent == d->recent ) { + } else if ( tqparent == d->recent ) { recentVisible++; } } @@ -1087,19 +1087,19 @@ AddressesDialog::allAddressee( KListView* view, bool onlySelected ) const } KABC::Addressee::List -AddressesDialog::allAddressee( AddresseeViewItem* parent ) const +AddressesDialog::allAddressee( AddresseeViewItem* tqparent ) const { KABC::Addressee::List lst; - if ( !parent ) return lst; + if ( !tqparent ) return lst; - if ( parent->category() == AddresseeViewItem::Entry ) + if ( tqparent->category() == AddresseeViewItem::Entry ) { - lst.append( parent->addressee() ); + lst.append( tqparent->addressee() ); return lst; } - AddresseeViewItem *myChild = static_cast<AddresseeViewItem*>( parent->firstChild() ); + AddresseeViewItem *myChild = static_cast<AddresseeViewItem*>( tqparent->firstChild() ); while( myChild ) { if ( myChild->category() == AddresseeViewItem::FilledGroup ) lst += myChild->addresses(); @@ -1111,15 +1111,15 @@ AddressesDialog::allAddressee( AddresseeViewItem* parent ) const return lst; } -QStringList -AddressesDialog::allDistributionLists( AddresseeViewItem* parent ) const +TQStringList +AddressesDialog::allDistributionLists( AddresseeViewItem* tqparent ) const { TQStringList lists; - if ( !parent ) + if ( !tqparent ) return TQStringList(); - AddresseeViewItem *item = static_cast<AddresseeViewItem*>( parent->firstChild() ); + AddresseeViewItem *item = static_cast<AddresseeViewItem*>( tqparent->firstChild() ); while ( item ) { if ( item->category() == AddresseeViewItem::DistList && !item->name().isEmpty() ) lists.append( item->name() ); diff --git a/libkdepim/addressesdialog.h b/libkdepim/addressesdialog.h index 4b3ea9dc9..71d6925da 100644 --- a/libkdepim/addressesdialog.h +++ b/libkdepim/addressesdialog.h @@ -38,6 +38,7 @@ namespace KPIM { class AddresseeViewItem : public TQObject, public KListViewItem { Q_OBJECT + TQ_OBJECT public: enum Category { @@ -49,10 +50,10 @@ namespace KPIM { FilledGroup =5, DistList =6 }; - AddresseeViewItem( AddresseeViewItem *parent, const KABC::Addressee& addr, int emailIndex = 0 ); + AddresseeViewItem( AddresseeViewItem *tqparent, const KABC::Addressee& addr, int emailIndex = 0 ); AddresseeViewItem( KListView *lv, const TQString& name, Category cat=Group ); - AddresseeViewItem( AddresseeViewItem *parent, const TQString& name, const KABC::Addressee::List &lst ); - AddresseeViewItem( AddresseeViewItem *parent, const TQString& name ); + AddresseeViewItem( AddresseeViewItem *tqparent, const TQString& name, const KABC::Addressee::List &lst ); + AddresseeViewItem( AddresseeViewItem *tqparent, const TQString& name ); ~AddresseeViewItem(); KABC::Addressee addressee() const; @@ -78,6 +79,7 @@ namespace KPIM { class KDE_EXPORT AddressesDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: AddressesDialog( TQWidget *widget=0, const char *name=0 ); ~AddressesDialog(); @@ -192,12 +194,12 @@ namespace KPIM { AddresseeViewItem* defaultParent=0, bool useCategory=true ); void addAddresseeToSelected( const KABC::Addressee& addr, AddresseeViewItem* defaultParent=0 ); - void addAddresseesToSelected( AddresseeViewItem *parent, + void addAddresseesToSelected( AddresseeViewItem *tqparent, const TQPtrList<AddresseeViewItem>& addresses ); TQStringList entryToString( const KABC::Addressee::List& l ) const; - KABC::Addressee::List allAddressee( AddresseeViewItem* parent ) const; + KABC::Addressee::List allAddressee( AddresseeViewItem* tqparent ) const; KABC::Addressee::List allAddressee( KListView* view, bool onlySelected = true ) const; - TQStringList allDistributionLists( AddresseeViewItem* parent ) const; + TQStringList allDistributionLists( AddresseeViewItem* tqparent ) const; private: // if there's only one group in the available list, open it diff --git a/libkdepim/addresspicker.ui b/libkdepim/addresspicker.ui index e0bf7a9a9..cf14f9896 100644 --- a/libkdepim/addresspicker.ui +++ b/libkdepim/addresspicker.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>AddressPickerUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>AddressPickerUI</cstring> </property> @@ -64,7 +64,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> <cstring>tqlayout10</cstring> </property> @@ -169,7 +169,7 @@ </spacer> </vbox> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -188,7 +188,7 @@ <cstring>mSelectedView</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -207,7 +207,7 @@ <cstring>mAvailableView</cstring> </property> </widget> - <widget class="QLayoutWidget" row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> <cstring>tqlayout1</cstring> </property> @@ -215,7 +215,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -226,7 +226,7 @@ <cstring>mFilterEdit</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>mFilterEdit</cstring> </property> @@ -289,7 +289,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton" row="2" column="2"> + <widget class="TQPushButton" row="2" column="2"> <property name="name"> <cstring>mSaveAs</cstring> </property> @@ -303,7 +303,7 @@ <string>Alt+D</string> </property> </widget> - <widget class="QPushButton" row="3" column="0"> + <widget class="TQPushButton" row="3" column="0"> <property name="name"> <cstring>mLdapSearch</cstring> </property> diff --git a/libkdepim/broadcaststatus.cpp b/libkdepim/broadcaststatus.cpp index fb48f05ca..68900936a 100644 --- a/libkdepim/broadcaststatus.cpp +++ b/libkdepim/broadcaststatus.cpp @@ -23,37 +23,37 @@ #include "broadcaststatus.h" #include "progressmanager.h" -KPIM::BroadcasStatus* KPIM::BroadcasStatus::instance_ = 0; -static KStaticDeleter<KPIM::BroadcasStatus> broadcasStatusDeleter; +KPIM::BroadcastqStatus* KPIM::BroadcastqStatus::instance_ = 0; +static KStaticDeleter<KPIM::BroadcastqStatus> broadcasStatusDeleter; namespace KPIM { -BroadcasStatus* BroadcasStatus::instance() +BroadcastqStatus* BroadcastqStatus::instance() { if (!instance_) - broadcasStatusDeleter.setObject( instance_, new BroadcasStatus() ); + broadcasStatusDeleter.setObject( instance_, new BroadcastqStatus() ); return instance_; } -BroadcasStatus::BroadcasStatus() +BroadcastqStatus::BroadcastqStatus() :mTransientActive( false ) { } -BroadcasStatus::~BroadcasStatus() +BroadcastqStatus::~BroadcastqStatus() { instance_ = 0; } -void BroadcasStatus::seStatusMsg( const TQString& message ) +void BroadcastqStatus::seStatusMsg( const TQString& message ) { mStatusMsg = message; if( !mTransientActive ) emit statusMsg( message ); } -void BroadcasStatus::seStatusMsgWithTimestamp( const TQString& message ) +void BroadcastqStatus::seStatusMsgWithTimestamp( const TQString& message ) { KLocale* locale = KGlobal::locale(); seStatusMsg( i18n( "%1 is a time, %2 is a status message", "[%1] %2" ) @@ -62,7 +62,7 @@ void BroadcasStatus::seStatusMsgWithTimestamp( const TQString& message ) .arg( message ) ); } -void BroadcasStatus::seStatusMsgTransmissionCompleted( int numMessages, +void BroadcastqStatus::seStatusMsgTransmissionCompleted( int numMessages, int numBytes, int numBytesRead, int numBytesToRead, @@ -96,10 +96,10 @@ void BroadcasStatus::seStatusMsgTransmissionCompleted( int numMessages, seStatusMsgWithTimestamp( statusMsg ); if ( item ) - item->seStatus( statusMsg ); + item->setqStatus( statusMsg ); } -void BroadcasStatus::seStatusMsgTransmissionCompleted( const TQString& account, +void BroadcastqStatus::seStatusMsgTransmissionCompleted( const TQString& account, int numMessages, int numBytes, int numBytesRead, @@ -144,16 +144,16 @@ void BroadcasStatus::seStatusMsgTransmissionCompleted( const TQString& account, seStatusMsgWithTimestamp( statusMsg ); if ( item ) - item->seStatus( statusMsg ); + item->setqStatus( statusMsg ); } -void BroadcasStatus::setTransienStatusMsg( const TQString& msg ) +void BroadcastqStatus::setTransienStatusMsg( const TQString& msg ) { mTransientActive = true; emit statusMsg( msg ); } -void BroadcasStatus::reset() +void BroadcastqStatus::reset() { mTransientActive = false; // restore diff --git a/libkdepim/broadcaststatus.h b/libkdepim/broadcaststatus.h index 11eacd3e6..24365580b 100644 --- a/libkdepim/broadcaststatus.h +++ b/libkdepim/broadcaststatus.h @@ -29,16 +29,17 @@ class ProgressItem; */ -class KDE_EXPORT BroadcasStatus : public QObject +class KDE_EXPORT BroadcastqStatus : public TQObject { Q_OBJECT + TQ_OBJECT public: - virtual ~BroadcasStatus(); + virtual ~BroadcastqStatus(); /** Return the instance of the singleton object for this class */ - static BroadcasStatus *instance(); + static BroadcastqStatus *instance(); /** Return the last status message from seStatusMsg() */ TQString statusMsg() const { return mStatusMsg; } @@ -82,10 +83,10 @@ signals: protected: - BroadcasStatus(); + BroadcastqStatus(); TQString mStatusMsg; bool mTransientActive; - static BroadcasStatus* instance_; + static BroadcastqStatus* instance_; }; diff --git a/libkdepim/calendardiffalgo.cpp b/libkdepim/calendardiffalgo.cpp index 79676fb84..dc22fd30e 100644 --- a/libkdepim/calendardiffalgo.cpp +++ b/libkdepim/calendardiffalgo.cpp @@ -42,17 +42,17 @@ static TQString toString( KCal::Attendee *attendee ) static TQString toString( KCal::Alarm * ) { - return TQString::null; + return TQString(); } static TQString toString( KCal::Incidence * ) { - return TQString::null; + return TQString(); } static TQString toString( KCal::Attachment * ) { - return TQString::null; + return TQString(); } static TQString toString( const TQDate &date ) @@ -138,7 +138,7 @@ void CalendarDiffAlgo::diffIncidence( KCal::Incidence *left, KCal::Incidence *ri conflictField( i18n( "Summary" ), left->summary(), right->summary() ); if ( left->status() != right->status() ) - conflictField( i18n( "Status" ), left->statusStr(), right->statusStr() ); + conflictField( i18n( "tqStatus" ), left->statusStr(), right->statusStr() ); if ( left->secrecy() != right->secrecy() ) conflictField( i18n( "Secrecy" ), toString( left->secrecy() ), toString( right->secrecy() ) ); @@ -202,12 +202,12 @@ void CalendarDiffAlgo::diffList( const TQString &id, const TQValueList<L> &left, const TQValueList<L> &right ) { for ( uint i = 0; i < left.count(); ++i ) { - if ( right.find( left[ i ] ) == right.end() ) + if ( right.tqfind( left[ i ] ) == right.end() ) additionalLeftField( id, toString( left[ i ] ) ); } for ( uint i = 0; i < right.count(); ++i ) { - if ( left.find( right[ i ] ) == left.end() ) + if ( left.tqfind( right[ i ] ) == left.end() ) additionalRightField( id, toString( right[ i ] ) ); } } diff --git a/libkdepim/categoryeditdialog.cpp b/libkdepim/categoryeditdialog.cpp index d386ae101..c5c4885bd 100644 --- a/libkdepim/categoryeditdialog.cpp +++ b/libkdepim/categoryeditdialog.cpp @@ -43,7 +43,7 @@ class CategoryEditDialog::Private TQPushButton *mDeleteButton; }; -class CategoryListViewItem : public QListViewItem +class CategoryListViewItem : public TQListViewItem { public: CategoryListViewItem( TQListView *view, const TQString &text ) : @@ -57,9 +57,9 @@ class CategoryListViewItem : public QListViewItem } }; -CategoryEditDialog::CategoryEditDialog( KPimPrefs *prefs, TQWidget* parent, +CategoryEditDialog::CategoryEditDialog( KPimPrefs *prefs, TQWidget* tqparent, const char* name, bool modal ) - : KDialogBase::KDialogBase( parent, name, modal, + : KDialogBase::KDialogBase( tqparent, name, modal, i18n("Edit Categories"), Ok|Apply|Cancel|Help, Ok, true ), mPrefs( prefs ), d( new Private ) { diff --git a/libkdepim/categoryeditdialog.h b/libkdepim/categoryeditdialog.h index f8168b7af..761dbad15 100644 --- a/libkdepim/categoryeditdialog.h +++ b/libkdepim/categoryeditdialog.h @@ -32,8 +32,9 @@ namespace KPIM { class KDE_EXPORT CategoryEditDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - CategoryEditDialog( KPimPrefs *prefs, TQWidget* parent = 0, + CategoryEditDialog( KPimPrefs *prefs, TQWidget* tqparent = 0, const char* name = 0, bool modal = false ); ~CategoryEditDialog(); diff --git a/libkdepim/categoryeditdialog_base.ui b/libkdepim/categoryeditdialog_base.ui index b23a66972..d8f903d00 100644 --- a/libkdepim/categoryeditdialog_base.ui +++ b/libkdepim/categoryeditdialog_base.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>CategoryEditDialog_base</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CategoryEditDialog_base</cstring> </property> @@ -25,12 +25,12 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLineEdit" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>mEdit</cstring> </property> </widget> - <widget class="QListView" row="0" column="0"> + <widget class="TQListView" row="0" column="0"> <column> <property name="text"> <string>Category</string> @@ -52,7 +52,7 @@ <enum>AllColumns</enum> </property> </widget> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> <cstring>tqlayout103</cstring> </property> @@ -60,7 +60,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>mButtonAdd</cstring> </property> @@ -68,7 +68,7 @@ <string>A&dd</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>mButtonRemove</cstring> </property> diff --git a/libkdepim/categoryselectdialog.cpp b/libkdepim/categoryselectdialog.cpp index 4eb072b12..982e11517 100644 --- a/libkdepim/categoryselectdialog.cpp +++ b/libkdepim/categoryselectdialog.cpp @@ -32,9 +32,9 @@ using namespace KPIM; -CategorySelectDialog::CategorySelectDialog( KPimPrefs *prefs, TQWidget* parent, +CategorySelectDialog::CategorySelectDialog( KPimPrefs *prefs, TQWidget* tqparent, const char* name, bool modal ) - : KDialogBase::KDialogBase( parent, name, modal, + : KDialogBase::KDialogBase( tqparent, name, modal, i18n("Select Categories"), Ok|Apply|Cancel|Help, Ok, true ), mPrefs( prefs ) { @@ -58,7 +58,7 @@ void CategorySelectDialog::setCategories( const TQStringList &categoryList ) TQStringList::ConstIterator it; for ( it = categoryList.begin(); it != categoryList.end(); ++it ) - if ( mPrefs->mCustomCategories.find( *it ) == mPrefs->mCustomCategories.end() ) + if ( mPrefs->mCustomCategories.tqfind( *it ) == mPrefs->mCustomCategories.end() ) mPrefs->mCustomCategories.append( *it ); for ( it = mPrefs->mCustomCategories.begin(); diff --git a/libkdepim/categoryselectdialog.h b/libkdepim/categoryselectdialog.h index dd5ad3b50..9c3044443 100644 --- a/libkdepim/categoryselectdialog.h +++ b/libkdepim/categoryselectdialog.h @@ -33,8 +33,9 @@ namespace KPIM { class KDE_EXPORT CategorySelectDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - CategorySelectDialog( KPimPrefs *prefs, TQWidget *parent = 0, + CategorySelectDialog( KPimPrefs *prefs, TQWidget *tqparent = 0, const char *name = 0, bool modal = false ); ~CategorySelectDialog(); diff --git a/libkdepim/categoryselectdialog_base.ui b/libkdepim/categoryselectdialog_base.ui index c5030679a..c728e4f12 100644 --- a/libkdepim/categoryselectdialog_base.ui +++ b/libkdepim/categoryselectdialog_base.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>CategorySelectDialog_base</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CategorySelectDialog_base</cstring> </property> @@ -25,7 +25,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Category</string> @@ -41,7 +41,7 @@ <cstring>mCategories</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout12</cstring> </property> @@ -55,7 +55,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>mButtonClear</cstring> </property> @@ -80,7 +80,7 @@ </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>mButtonEdit</cstring> </property> diff --git a/libkdepim/cfgc/example.cfg b/libkdepim/cfgc/example.cfg index 28a2d06b1..1cc4feff3 100644 --- a/libkdepim/cfgc/example.cfg +++ b/libkdepim/cfgc/example.cfg @@ -27,12 +27,12 @@ </entry> </group> <group name="MyOptions"> - <entry type="TQString"> + <entry type=TQSTRING_OBJECT_NAME_STRING> <name>MyString</name> <label>This is a string</label> <default>Default String</default> </entry> - <entry type="TQStringList"> + <entry type=TQSTRINGLIST_OBJECT_NAME_STRING> <name>MyStringList</name> <default>up,down</default> </entry> diff --git a/libkdepim/cfgc/general_base.ui b/libkdepim/cfgc/general_base.ui index 040990ef1..e5d8bfedc 100644 --- a/libkdepim/cfgc/general_base.ui +++ b/libkdepim/cfgc/general_base.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>GeneralBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>GeneralBase</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="1"> + <widget class="TQCheckBox" row="0" column="1"> <property name="name"> <cstring>OneOption</cstring> </property> @@ -27,12 +27,12 @@ <string>OneOption</string> </property> </widget> - <widget class="QSpinBox" row="1" column="1"> + <widget class="TQSpinBox" row="1" column="1"> <property name="name"> <cstring>Another_Option</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> diff --git a/libkdepim/cfgc/myoptions_base.ui b/libkdepim/cfgc/myoptions_base.ui index fe5d43ac6..eadcb0302 100644 --- a/libkdepim/cfgc/myoptions_base.ui +++ b/libkdepim/cfgc/myoptions_base.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>MyOptionsBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>MyOptionsBase</cstring> </property> @@ -12,7 +12,7 @@ <height>480</height> </rect> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -28,7 +28,7 @@ <string>MyString:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>MyString</cstring> </property> diff --git a/libkdepim/clicklineedit.cpp b/libkdepim/clicklineedit.cpp index 98748e44a..f8bfe0e91 100644 --- a/libkdepim/clicklineedit.cpp +++ b/libkdepim/clicklineedit.cpp @@ -26,8 +26,8 @@ using namespace KPIM; -ClickLineEdit::ClickLineEdit(TQWidget *parent, const TQString &msg, const char* name) : - KLineEdit(parent, name) +ClickLineEdit::ClickLineEdit(TQWidget *tqparent, const TQString &msg, const char* name) : + KLineEdit(tqparent, name) { mDrawClickMsg = true; setClickMessage( msg ); diff --git a/libkdepim/clicklineedit.h b/libkdepim/clicklineedit.h index 65357375d..f9a9543d0 100644 --- a/libkdepim/clicklineedit.h +++ b/libkdepim/clicklineedit.h @@ -27,7 +27,7 @@ namespace KPIM { /** - This class provides a KLineEdit which tqcontains a greyed-out hinting + This class provides a KLineEdit which contains a greyed-out hinting text as long as the user didn't enter any text @short LineEdit with customizable "Click here" text @@ -36,9 +36,10 @@ namespace KPIM { class KDE_EXPORT ClickLineEdit : public KLineEdit { Q_OBJECT - Q_PROPERTY( TQString clickMessage READ clickMessage WRITE setClickMessage ) + TQ_OBJECT + TQ_PROPERTY( TQString clickMessage READ clickMessage WRITE setClickMessage ) public: - ClickLineEdit( TQWidget *parent, const TQString &msg = TQString::null, const char* name = 0 ); + ClickLineEdit( TQWidget *tqparent, const TQString &msg = TQString(), const char* name = 0 ); ~ClickLineEdit(); void setClickMessage( const TQString &msg ); diff --git a/libkdepim/collectingprocess.cpp b/libkdepim/collectingprocess.cpp index 2e1b61714..d49da43b8 100644 --- a/libkdepim/collectingprocess.cpp +++ b/libkdepim/collectingprocess.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -49,8 +49,8 @@ struct CollectingProcess::Private { }; -CollectingProcess::CollectingProcess( TQObject * parent, const char * name ) - : KProcess( parent, name ) +CollectingProcess::CollectingProcess( TQObject * tqparent, const char * name ) + : KProcess( tqparent, name ) { d = new Private(); } diff --git a/libkdepim/collectingprocess.h b/libkdepim/collectingprocess.h index aff8a8d32..8bc4651be 100644 --- a/libkdepim/collectingprocess.h +++ b/libkdepim/collectingprocess.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -48,8 +48,9 @@ namespace KPIM { */ class KDE_EXPORT CollectingProcess : public KProcess { Q_OBJECT + TQ_OBJECT public: - CollectingProcess( TQObject * parent = 0, const char * name = 0 ); + CollectingProcess( TQObject * tqparent = 0, const char * name = 0 ); ~CollectingProcess(); /** Starts the process in NotifyOnExit mode and writes in to stdin of diff --git a/libkdepim/completionordereditor.cpp b/libkdepim/completionordereditor.cpp index 9fd4950aa..e4821f3dc 100644 --- a/libkdepim/completionordereditor.cpp +++ b/libkdepim/completionordereditor.cpp @@ -18,11 +18,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -160,7 +160,7 @@ private: ///////// -class CompletionViewItem : public QListViewItem +class CompletionViewItem : public TQListViewItem { public: CompletionViewItem( TQListView* lv, CompletionItem* item ) @@ -173,8 +173,8 @@ private: }; CompletionOrderEditor::CompletionOrderEditor( KPIM::LdapSearch* ldapSearch, - TQWidget* parent, const char* name ) - : KDialogBase( parent, name, true, i18n("Edit Completion Order"), Ok|Cancel, Ok, true ), + TQWidget* tqparent, const char* name ) + : KDialogBase( tqparent, name, true, i18n("Edit Completion Order"), Ok|Cancel, Ok, true ), mConfig( "kpimcompletionorder" ), mDirty( false ) { mItems.setAutoDelete( true ); @@ -213,7 +213,7 @@ CompletionOrderEditor::CompletionOrderEditor( KPIM::LdapSearch* ldapSearch, TQHBox* page = makeHBoxMainWidget(); mListView = new KListView( page ); mListView->setSorting( -1 ); - mListView->addColumn( TQString::null ); + mListView->addColumn( TQString() ); mListView->header()->hide(); for( TQPtrListIterator<CompletionItem> compit( mItems ); *compit; ++compit ) { diff --git a/libkdepim/completionordereditor.h b/libkdepim/completionordereditor.h index 0e17a5342..7d4d3e47a 100644 --- a/libkdepim/completionordereditor.h +++ b/libkdepim/completionordereditor.h @@ -18,11 +18,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -63,9 +63,10 @@ public: class CompletionOrderEditor : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - CompletionOrderEditor( KPIM::LdapSearch* ldapSearch, TQWidget* parent, const char* name = 0 ); + CompletionOrderEditor( KPIM::LdapSearch* ldapSearch, TQWidget* tqparent, const char* name = 0 ); ~CompletionOrderEditor(); KConfig* configFile() { return &mConfig; } diff --git a/libkdepim/configmanager.cpp b/libkdepim/configmanager.cpp index 64b4562fc..47bcb9d0d 100644 --- a/libkdepim/configmanager.cpp +++ b/libkdepim/configmanager.cpp @@ -21,8 +21,8 @@ using namespace KPIM; -ConfigManager::ConfigManager( TQObject * parent, const char * name ) - : TQObject( parent, name ) +ConfigManager::ConfigManager( TQObject * tqparent, const char * name ) + : TQObject( tqparent, name ) { } diff --git a/libkdepim/configmanager.h b/libkdepim/configmanager.h index 44a170bcc..ba024093e 100644 --- a/libkdepim/configmanager.h +++ b/libkdepim/configmanager.h @@ -31,6 +31,7 @@ namespace KPIM { **/ class KDE_EXPORT ConfigManager : public TQObject { Q_OBJECT + TQ_OBJECT public: /** Commit changes to disk and emit changed() if necessary. */ virtual void commit() = 0; @@ -45,7 +46,7 @@ signals: void changed(); protected: - ConfigManager( TQObject * parent=0, const char * name=0 ); + ConfigManager( TQObject * tqparent=0, const char * name=0 ); virtual ~ConfigManager(); }; diff --git a/libkdepim/csshelper.cpp b/libkdepim/csshelper.cpp index 4116e583e..f828476f6 100644 --- a/libkdepim/csshelper.cpp +++ b/libkdepim/csshelper.cpp @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -83,7 +83,7 @@ namespace KPIM { cPgpOk1H = TQColor( 0x40, 0xFF, 0x40 ); // light green cPgpOk0H = TQColor( 0xFF, 0xFF, 0x40 ); // light yellow cPgpWarnH = TQColor( 0xFF, 0xFF, 0x40 ); // light yellow - cPgpErrH = Qt::red; + cPgpErrH = TQt::red; for ( int i = 0 ; i < 3 ; ++i ) mQuoteColor[i] = TQColor( 0x00, 0x80 - i * 0x10, 0x00 ); // shades of green diff --git a/libkdepim/csshelper.h b/libkdepim/csshelper.h index 3dbc80c03..ab9190cf8 100644 --- a/libkdepim/csshelper.h +++ b/libkdepim/csshelper.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/libkdepim/designerfields.cpp b/libkdepim/designerfields.cpp index bb5b8c258..6907485d0 100644 --- a/libkdepim/designerfields.cpp +++ b/libkdepim/designerfields.cpp @@ -41,9 +41,9 @@ using namespace KPIM; -DesignerFields::DesignerFields( const TQString &uiFile, TQWidget *parent, +DesignerFields::DesignerFields( const TQString &uiFile, TQWidget *tqparent, const char *name ) - : TQWidget( parent, name ) + : TQWidget( tqparent, name ) { initGUI( uiFile ); } @@ -145,15 +145,15 @@ void DesignerFields::load( DesignerFields::Storage *storage ) TQString value; if ( widIt.data()->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) ) { TQLineEdit *wdg = static_cast<TQLineEdit*>( widIt.data() ); - wdg->setText( TQString::null ); + wdg->setText( TQString() ); } else if ( widIt.data()->inherits( TQSPINBOX_OBJECT_NAME_STRING ) ) { TQSpinBox *wdg = static_cast<TQSpinBox*>( widIt.data() ); wdg->setValue( wdg->minValue() ); } else if ( widIt.data()->inherits( TQCHECKBOX_OBJECT_NAME_STRING ) ) { TQCheckBox *wdg = static_cast<TQCheckBox*>( widIt.data() ); wdg->setChecked( false ); - } else if ( widIt.data()->inherits( "QDateTimeEdit" ) ) { - QDateTimeEdit *wdg = static_cast<QDateTimeEdit*>( widIt.data() ); + } else if ( widIt.data()->inherits( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) { + TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( widIt.data() ); wdg->setDateTime( TQDateTime::tqcurrentDateTime() ); } else if ( widIt.data()->inherits( "KDateTimeWidget" ) ) { KDateTimeWidget *wdg = static_cast<KDateTimeWidget*>( widIt.data() ); @@ -166,7 +166,7 @@ void DesignerFields::load( DesignerFields::Storage *storage ) wdg->setCurrentItem( 0 ); } else if ( widIt.data()->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) ) { TQTextEdit *wdg = static_cast<TQTextEdit*>( widIt.data() ); - wdg->setText( TQString::null ); + wdg->setText( TQString() ); } } @@ -174,7 +174,7 @@ void DesignerFields::load( DesignerFields::Storage *storage ) for ( it2 = keys.begin(); it2 != keys.end(); ++it2 ) { TQString value = storage->read( *it2 ); - TQMap<TQString, TQWidget *>::ConstIterator it = mWidgets.find( *it2 ); + TQMap<TQString, TQWidget *>::ConstIterator it = mWidgets.tqfind( *it2 ); if ( it != mWidgets.end() ) { if ( it.data()->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) ) { TQLineEdit *wdg = static_cast<TQLineEdit*>( it.data() ); @@ -186,14 +186,14 @@ void DesignerFields::load( DesignerFields::Storage *storage ) TQCheckBox *wdg = static_cast<TQCheckBox*>( it.data() ); wdg->setChecked( value == "true" || value == "1" ); } else if ( it.data()->inherits( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) { - QDateTimeEdit *wdg = static_cast<QDateTimeEdit*>( it.data() ); - wdg->setDateTime( TQDateTime::fromString( value, Qt::ISODate ) ); + TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( it.data() ); + wdg->setDateTime( TQDateTime::fromString( value, TQt::ISODate ) ); } else if ( it.data()->inherits( "KDateTimeWidget" ) ) { KDateTimeWidget *wdg = static_cast<KDateTimeWidget*>( it.data() ); - wdg->setDateTime( TQDateTime::fromString( value, Qt::ISODate ) ); + wdg->setDateTime( TQDateTime::fromString( value, TQt::ISODate ) ); } else if ( it.data()->inherits( "KDatePicker" ) ) { KDatePicker *wdg = static_cast<KDatePicker*>( it.data() ); - wdg->setDate( TQDate::fromString( value, Qt::ISODate ) ); + wdg->setDate( TQDate::fromString( value, TQt::ISODate ) ); } else if ( it.data()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) { TQComboBox *wdg = static_cast<TQComboBox*>( it.data() ); wdg->setCurrentText( value ); @@ -219,15 +219,15 @@ void DesignerFields::save( DesignerFields::Storage *storage ) } else if ( it.data()->inherits( TQCHECKBOX_OBJECT_NAME_STRING ) ) { TQCheckBox *wdg = static_cast<TQCheckBox*>( it.data() ); value = ( wdg->isChecked() ? "true" : "false" ); - } else if ( it.data()->inherits( "QDateTimeEdit" ) ) { - QDateTimeEdit *wdg = static_cast<QDateTimeEdit*>( it.data() ); - value = wdg->dateTime().toString( Qt::ISODate ); + } else if ( it.data()->inherits( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) { + TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( it.data() ); + value = wdg->dateTime().toString( TQt::ISODate ); } else if ( it.data()->inherits( "KDateTimeWidget" ) ) { KDateTimeWidget *wdg = static_cast<KDateTimeWidget*>( it.data() ); - value = wdg->dateTime().toString( Qt::ISODate ); + value = wdg->dateTime().toString( TQt::ISODate ); } else if ( it.data()->inherits( "KDatePicker" ) ) { KDatePicker *wdg = static_cast<KDatePicker*>( it.data() ); - value = wdg->date().toString( Qt::ISODate ); + value = wdg->date().toString( TQt::ISODate ); } else if ( it.data()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) { TQComboBox *wdg = static_cast<TQComboBox*>( it.data() ); value = wdg->currentText(); @@ -244,7 +244,7 @@ void DesignerFields::setReadOnly( bool readOnly ) { TQMap<TQString, TQWidget*>::Iterator it; for ( it = mWidgets.begin(); it != mWidgets.end(); ++it ) - if ( mDisabledWidgets.find( it.data() ) == mDisabledWidgets.end() ) + if ( mDisabledWidgets.tqfind( it.data() ) == mDisabledWidgets.end() ) it.data()->setEnabled( !readOnly ); } diff --git a/libkdepim/designerfields.h b/libkdepim/designerfields.h index 2d5db2b12..89032eadd 100644 --- a/libkdepim/designerfields.h +++ b/libkdepim/designerfields.h @@ -32,11 +32,12 @@ namespace KPIM { -class KDE_EXPORT DesignerFields : public QWidget +class KDE_EXPORT DesignerFields : public TQWidget { Q_OBJECT + TQ_OBJECT public: - DesignerFields( const TQString &uiFile, TQWidget *parent, + DesignerFields( const TQString &uiFile, TQWidget *tqparent, const char *name = 0 ); class Storage diff --git a/libkdepim/diffalgo.cpp b/libkdepim/diffalgo.cpp index 21c476861..428316568 100644 --- a/libkdepim/diffalgo.cpp +++ b/libkdepim/diffalgo.cpp @@ -75,7 +75,7 @@ void DiffAlgo::conflictField( const TQString &id, const TQString &leftValue, void DiffAlgo::addDisplay( DiffAlgoDisplay *display ) { - if ( mDisplays.find( display ) == mDisplays.end() ) + if ( mDisplays.tqfind( display ) == mDisplays.end() ) mDisplays.append( display ); } diff --git a/libkdepim/distributionlist.cpp b/libkdepim/distributionlist.cpp index 6d96b2358..97b11bcf8 100644 --- a/libkdepim/distributionlist.cpp +++ b/libkdepim/distributionlist.cpp @@ -28,7 +28,7 @@ void KPIM::DistributionList::setName( const TQString &name ) // Helper function, to parse the contents of the custom field // Returns a list of { uid, email } -typedef TQValueList<QPair<TQString, TQString> > ParseList; +typedef TQValueList<TQPair<TQString, TQString> > ParseList; static ParseList parseCustom( const TQString& str ) { ParseList res; @@ -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 ); // tqreplace old value + insertCustom( "KADDRESSBOOK", s_customFieldName, str ); // replace 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 ); // tqreplace old value + insertCustom( "KADDRESSBOOK", s_customFieldName, str ); // replace 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 tqfindByUidOrName( KABC::AddressBook* book, const TQString& uidOrName, const TQString& email ) +static KABC::Addressee findByUidOrName( KABC::AddressBook* book, const TQString& uidOrName, const TQString& email ) { - KABC::Addressee a = book->tqfindByUid( uidOrName ); + KABC::Addressee a = book->findByUid( 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->tqfindByEmail( email ); + KABC::Addressee::List lst = book->findByEmail( 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 = tqfindByUidOrName( book, uid, email ); + KABC::Addressee a = findByUidOrName( 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 = tqfindByUidOrName( book, thisUid, thisEmail ); + KABC::Addressee a = findByUidOrName( book, thisUid, thisEmail ); if ( a.isEmpty() ) { // ## The old DistributionListManager had a "missing entries" list... continue; diff --git a/libkdepim/distributionlist.h b/libkdepim/distributionlist.h index 06b720b03..0faaeeec6 100644 --- a/libkdepim/distributionlist.h +++ b/libkdepim/distributionlist.h @@ -89,18 +89,18 @@ class DistributionList : public KABC::Addressee Insert an entry into this distribution list. If the entry already exists nothing happens. */ - void insertEntry( const Addressee &, const TQString &email=TQString::null ); + void insertEntry( const Addressee &, const TQString &email=TQString() ); /** Remove an entry from this distribution list. If the entry doesn't exist nothing happens. */ - void removeEntry( const Addressee &, const TQString &email=TQString::null ); + void removeEntry( const Addressee &, const TQString &email=TQString() ); /// Overload, used by resources to avoid looking up the addressee - void insertEntry( const TQString& uid, const TQString& email=TQString::null ); + void insertEntry( const TQString& uid, const TQString& email=TQString() ); /// Overload, used by resources to avoid looking up the addressee - void removeEntry( const TQString& uid, const TQString& email=TQString::null ); + void removeEntry( const TQString& uid, const TQString& email=TQString() ); /** diff --git a/libkdepim/embeddedurlpage.cpp b/libkdepim/embeddedurlpage.cpp index 12b25dedb..e73911f00 100644 --- a/libkdepim/embeddedurlpage.cpp +++ b/libkdepim/embeddedurlpage.cpp @@ -33,8 +33,8 @@ using namespace KPIM; EmbeddedURLPage::EmbeddedURLPage( const TQString &url, const TQString &mimetype, - TQWidget *parent, const char *name ) - : TQWidget( parent, name ), mUri(url), mMimeType( mimetype ), mPart( 0 ) + TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ), mUri(url), mMimeType( mimetype ), mPart( 0 ) { initGUI( url, mimetype ); } @@ -54,8 +54,8 @@ void EmbeddedURLPage::loadContents() TQString mimetype = mMimeType; if ( mimetype == "auto" ) mimetype == KMimeType::findByURL( mUri )->name(); - // "this" is both the parent widget and the parent object - mPart = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString::null, this, 0, this, 0 ); + // "this" is both the tqparent widget and the tqparent object + mPart = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString(), this, 0, this, 0 ); if ( mPart ) { mPart->openURL( mUri ); mPart->widget()->show(); diff --git a/libkdepim/embeddedurlpage.h b/libkdepim/embeddedurlpage.h index 61f8933ad..7f5c4c9e2 100644 --- a/libkdepim/embeddedurlpage.h +++ b/libkdepim/embeddedurlpage.h @@ -29,12 +29,13 @@ namespace KParts { class ReadOnlyPart; } namespace KPIM { -class KDE_EXPORT EmbeddedURLPage : public QWidget +class KDE_EXPORT EmbeddedURLPage : public TQWidget { Q_OBJECT + TQ_OBJECT public: EmbeddedURLPage( const TQString &url, const TQString &mimetype, - TQWidget *parent, const char *name = 0 ); + TQWidget *tqparent, const char *name = 0 ); public slots: void loadContents(); diff --git a/libkdepim/htmldiffalgodisplay.cpp b/libkdepim/htmldiffalgodisplay.cpp index 2c6af164b..19b99d4e4 100644 --- a/libkdepim/htmldiffalgodisplay.cpp +++ b/libkdepim/htmldiffalgodisplay.cpp @@ -30,8 +30,8 @@ static TQString textToHTML( const TQString &text ) return TQStyleSheet::convertFromPlainText( text ); } -HTMLDiffAlgoDisplay::HTMLDiffAlgoDisplay( TQWidget *parent ) - : KTextBrowser( parent ) +HTMLDiffAlgoDisplay::HTMLDiffAlgoDisplay( TQWidget *tqparent ) + : KTextBrowser( tqparent ) { setWrapPolicy( TQTextEdit::AtWordBoundary ); setVScrollBarMode( TQScrollView::AlwaysOff ); diff --git a/libkdepim/htmldiffalgodisplay.h b/libkdepim/htmldiffalgodisplay.h index 4495e2003..55090f41c 100644 --- a/libkdepim/htmldiffalgodisplay.h +++ b/libkdepim/htmldiffalgodisplay.h @@ -32,7 +32,7 @@ namespace KPIM { class KDE_EXPORT HTMLDiffAlgoDisplay : virtual public DiffAlgoDisplay, public KTextBrowser { public: - HTMLDiffAlgoDisplay( TQWidget *parent ); + HTMLDiffAlgoDisplay( TQWidget *tqparent ); void begin(); void end(); diff --git a/libkdepim/infoextension.cpp b/libkdepim/infoextension.cpp index 55cb35683..3c8ac26f9 100644 --- a/libkdepim/infoextension.cpp +++ b/libkdepim/infoextension.cpp @@ -26,8 +26,8 @@ using namespace KParts; -InfoExtension::InfoExtension( KParts::ReadOnlyPart *parent, const char* name) -: TQObject(parent, name), d(0) +InfoExtension::InfoExtension( KParts::ReadOnlyPart *tqparent, const char* name) +: TQObject(tqparent, name), d(0) { } diff --git a/libkdepim/infoextension.h b/libkdepim/infoextension.h index 0a992a154..343f71720 100644 --- a/libkdepim/infoextension.h +++ b/libkdepim/infoextension.h @@ -35,18 +35,19 @@ namespace KParts /** * Provides a way to get information out of a PIM-Part **/ - class KDE_EXPORT InfoExtension : public QObject + class KDE_EXPORT InfoExtension : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Constucts an InfoExtension. * - * @param parent The parent widget. + * @param tqparent The tqparent widget. * @param name The name of the class. **/ - InfoExtension( KParts::ReadOnlyPart *parent, const char* name); + InfoExtension( KParts::ReadOnlyPart *tqparent, const char* name); ~InfoExtension(); private: diff --git a/libkdepim/kabcresourcecached.cpp b/libkdepim/kabcresourcecached.cpp index beeb7b900..7e6842bfb 100644 --- a/libkdepim/kabcresourcecached.cpp +++ b/libkdepim/kabcresourcecached.cpp @@ -178,7 +178,7 @@ void ResourceCached::insertAddressee( const Addressee &addr ) mAddrMap.insert( addr.uid(), addr ); mAddedAddressees.insert( addr.uid(), addr ); } else { - KABC::Addressee oldAddressee = mAddrMap.find( addr.uid() ).data(); + KABC::Addressee oldAddressee = mAddrMap.tqfind( addr.uid() ).data(); if ( oldAddressee != addr ) { mAddrMap.remove( addr.uid() ); mAddrMap.insert( addr.uid(), addr ); @@ -194,7 +194,7 @@ void ResourceCached::removeAddressee( const Addressee &addr ) return; } - if ( mDeletedAddressees.find( addr.uid() ) == mDeletedAddressees.end() ) + if ( mDeletedAddressees.tqfind( addr.uid() ) == mDeletedAddressees.end() ) mDeletedAddressees.insert( addr.uid(), addr ); mAddrMap.remove( addr.uid() ); diff --git a/libkdepim/kabcresourcecached.h b/libkdepim/kabcresourcecached.h index 00d6f4e8b..644819011 100644 --- a/libkdepim/kabcresourcecached.h +++ b/libkdepim/kabcresourcecached.h @@ -34,6 +34,7 @@ namespace KABC { class KDE_EXPORT ResourceCached : public Resource { Q_OBJECT + TQ_OBJECT public: /** diff --git a/libkdepim/kaccount.cpp b/libkdepim/kaccount.cpp index 9aab7cfec..392fea265 100644 --- a/libkdepim/kaccount.cpp +++ b/libkdepim/kaccount.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/libkdepim/kaccount.h b/libkdepim/kaccount.h index d81182767..7da944624 100644 --- a/libkdepim/kaccount.h +++ b/libkdepim/kaccount.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -50,7 +50,7 @@ class KDE_EXPORT KAccount Other }; - KAccount( const uint id = 0, const TQString &name = TQString::null, + KAccount( const uint id = 0, const TQString &name = TQString(), const Type type = Other ); /** @@ -75,13 +75,13 @@ class KDE_EXPORT KAccount * Save the settings * If the group is empty it must be preset in the KConfig */ - void writeConfig( KConfig &config, const TQString &group = TQString::null ); + void writeConfig( KConfig &config, const TQString &group = TQString() ); /** * Read the settings * If the group is empty it must be preset in the KConfig */ - void readConfig( KConfig &config, const TQString &group = TQString::null ); + void readConfig( KConfig &config, const TQString &group = TQString() ); protected: uint mId; diff --git a/libkdepim/kaddrbook.cpp b/libkdepim/kaddrbook.cpp index 187ce6375..7356bc2d8 100644 --- a/libkdepim/kaddrbook.cpp +++ b/libkdepim/kaddrbook.cpp @@ -32,7 +32,7 @@ #include <unistd.h> //----------------------------------------------------------------------------- -void KAddrBookExternal::openEmail( const TQString &addr, TQWidget *parent ) { +void KAddrBookExternal::openEmail( const TQString &addr, TQWidget *tqparent ) { TQString email; TQString name; @@ -56,7 +56,7 @@ void KAddrBookExternal::openEmail( const TQString &addr, TQWidget *parent ) { } #endif - KABC::Addressee::List addressees = ab->tqfindByEmail( email ); + KABC::Addressee::List addressees = ab->findByEmail( email ); if ( addressees.count() > 0 ) { if ( kapp->dcopClient()->isApplicationRegistered( "kaddressbook" ) ){ @@ -78,12 +78,12 @@ void KAddrBookExternal::openEmail( const TQString &addr, TQWidget *parent ) { #else TQString text = email + " " + i18n( "is not in address book" ); #endif - KMessageBox::information( parent, text, TQString::null, "notInAddressBook" ); + KMessageBox::information( tqparent, text, TQString(), "notInAddressBook" ); } } //----------------------------------------------------------------------------- -void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *parent) { +void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *tqparent) { TQString email; TQString name; @@ -91,7 +91,7 @@ void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *parent) { KABC::AddressBook *ab = KABC::StdAddressBook::self( true ); - ab->setErrorHandler( new KABC::GuiErrorHandler( parent ) ); + ab->setErrorHandler( new KABC::GuiErrorHandler( tqparent ) ); // force a reload of the address book file so that changes that were made // by other programs are loaded @@ -109,7 +109,7 @@ void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *parent) { } #endif - KABC::Addressee::List addressees = ab->tqfindByEmail( email ); + KABC::Addressee::List addressees = ab->findByEmail( email ); if ( addressees.isEmpty() ) { KABC::Addressee a; @@ -151,12 +151,12 @@ void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *parent) { TQString text = i18n("<qt>The email address <b>%1</b> was added to your " "addressbook; you can add more information to this " "entry by opening the addressbook.</qt>").arg( addr ); - KMessageBox::information( parent, text, TQString::null, "addedtokabc" ); + KMessageBox::information( tqparent, text, TQString(), "addedtokabc" ); } } else { TQString text = i18n("<qt>The email address <b>%1</b> is already in your " "addressbook.</qt>").arg( addr ); - KMessageBox::information( parent, text, TQString::null, + KMessageBox::information( tqparent, text, TQString(), "alreadyInAddressBook" ); } ab->setErrorHandler( 0 ); @@ -173,22 +173,22 @@ void KAddrBookExternal::addNewAddressee( TQWidget* ) call.send("newContact()"); } -bool KAddrBookExternal::addVCard( const KABC::Addressee& addressee, TQWidget *parent ) +bool KAddrBookExternal::addVCard( const KABC::Addressee& addressee, TQWidget *tqparent ) { KABC::AddressBook *ab = KABC::StdAddressBook::self( true ); bool inserted = false; - ab->setErrorHandler( new KABC::GuiErrorHandler( parent ) ); + ab->setErrorHandler( new KABC::GuiErrorHandler( tqparent ) ); KABC::Addressee::List addressees = - ab->tqfindByEmail( addressee.preferredEmail() ); + ab->findByEmail( addressee.preferredEmail() ); if ( addressees.isEmpty() ) { if ( KAddrBookExternal::addAddressee( addressee ) ) { TQString text = i18n("The VCard was added to your addressbook; " "you can add more information to this " "entry by opening the addressbook."); - KMessageBox::information( parent, text, TQString::null, "addedtokabc" ); + KMessageBox::information( tqparent, text, TQString(), "addedtokabc" ); inserted = true; } } else { @@ -196,7 +196,7 @@ bool KAddrBookExternal::addVCard( const KABC::Addressee& addressee, TQWidget *pa "your addressbook; however, you may save the VCard " "into a file and import it into the addressbook " "manually."); - KMessageBox::information( parent, text ); + KMessageBox::information( tqparent, text ); inserted = true; } @@ -229,7 +229,7 @@ bool KAddrBookExternal::addAddressee( const KABC::Addressee& addr ) TQString KAddrBookExternal::expandDistributionList( const TQString& listName ) { if ( listName.isEmpty() ) - return TQString::null; + return TQString(); const TQString lowerListName = listName.lower(); KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true ); @@ -251,7 +251,7 @@ TQString KAddrBookExternal::expandDistributionList( const TQString& listName ) } } #endif - return TQString::null; + return TQString(); } KABC::Resource* KAddrBookExternal::selectResourceForSaving( KABC::AddressBook *addressBook ) diff --git a/libkdepim/kaddrbook.h b/libkdepim/kaddrbook.h index 374753e54..b48352346 100644 --- a/libkdepim/kaddrbook.h +++ b/libkdepim/kaddrbook.h @@ -19,12 +19,12 @@ class TQWidget; class KDE_EXPORT KAddrBookExternal { public: - static void addEmail( const TQString &addr, TQWidget *parent ); + static void addEmail( const TQString &addr, TQWidget *tqparent ); static void addNewAddressee( TQWidget* ); - static void openEmail( const TQString &addr, TQWidget *parent ); - static void openAddressBook( TQWidget *parent ); + static void openEmail( const TQString &addr, TQWidget *tqparent ); + static void openAddressBook( TQWidget *tqparent ); - static bool addVCard( const KABC::Addressee& addressee, TQWidget *parent ); + static bool addVCard( const KABC::Addressee& addressee, TQWidget *tqparent ); static TQString expandDistributionList( const TQString& listName ); diff --git a/libkdepim/kcmdesignerfields.cpp b/libkdepim/kcmdesignerfields.cpp index bda4aa7d0..be4aa97bd 100644 --- a/libkdepim/kcmdesignerfields.cpp +++ b/libkdepim/kcmdesignerfields.cpp @@ -53,11 +53,11 @@ using namespace KPIM; -class PageItem : public QCheckListItem +class PageItem : public TQCheckListItem { public: - PageItem( TQListView *parent, const TQString &path ) - : TQCheckListItem( parent, "", TQCheckListItem::CheckBox ), + PageItem( TQListView *tqparent, const TQString &path ) + : TQCheckListItem( tqparent, "", TQCheckListItem::CheckBox ), mPath( path ), mIsActive( false ) { mName = path.mid( path.findRev( '/' ) + 1 ); @@ -85,7 +85,7 @@ class PageItem : public QCheckListItem allowedTypes.insert( "KDatePicker", i18n( "Date" ) ); while ( it.current() ) { - if ( allowedTypes.find( it.current()->className() ) != allowedTypes.end() ) { + if ( allowedTypes.tqfind( it.current()->className() ) != allowedTypes.end() ) { TQString name = it.current()->name(); if ( name.startsWith( "X_" ) ) { new TQListViewItem( this, name, @@ -126,13 +126,13 @@ class PageItem : public QCheckListItem bool mIsActive; }; -KCMDesignerFields::KCMDesignerFields( TQWidget *parent, const char *name ) - : KCModule( parent, name ) +KCMDesignerFields::KCMDesignerFields( TQWidget *tqparent, const char *name ) + : KCModule( tqparent, name ) { TQTimer::singleShot( 0, this, TQT_SLOT( delayedInit() ) ); KAboutData *about = new KAboutData( I18N_NOOP( "KCMDesignerfields" ), - I18N_NOOP( "Qt Designer Fields Dialog" ), + I18N_NOOP( "TQt Designer Fields Dialog" ), 0, 0, KAboutData::License_LGPL, I18N_NOOP( "(c), 2004 Tobias Koenig" ) ); @@ -174,7 +174,7 @@ void KCMDesignerFields::deleteFile() { TQListViewItem *item = mPageView->selectedItem(); if ( item ) { - PageItem *pageItem = static_cast<PageItem*>( item->parent() ? item->parent() : item ); + PageItem *pageItem = static_cast<PageItem*>( item->tqparent() ? item->tqparent() : item ); if (KMessageBox::warningContinueCancel(this, i18n( "<qt>Do you really want to delete '<b>%1</b>'?</qt>").arg( pageItem->text(0) ), "", KStdGuiItem::del() ) == KMessageBox::Continue) @@ -215,9 +215,9 @@ void KCMDesignerFields::loadActivePages(const TQStringList& ai) { TQListViewItemIterator it( mPageView ); while ( it.current() ) { - if ( it.current()->parent() == 0 ) { + if ( it.current()->tqparent() == 0 ) { PageItem *item = static_cast<PageItem*>( it.current() ); - if ( ai.find( item->name() ) != ai.end() ) { + if ( ai.tqfind( item->name() ) != ai.end() ) { item->setOn( true ); item->setIsActive( true ); } @@ -239,7 +239,7 @@ TQStringList KCMDesignerFields::saveActivePages() TQStringList activePages; while ( it.current() ) { - if ( it.current()->parent() == 0 ) { + if ( it.current()->tqparent() == 0 ) { PageItem *item = static_cast<PageItem*>( it.current() ); activePages.append( item->name() ); } @@ -269,7 +269,7 @@ void KCMDesignerFields::initGUI() if ( noDesigner ) { TQString txt = - i18n("<qt><b>Warning:</b> Qt Designer could not be found. It is probably not " + i18n("<qt><b>Warning:</b> TQt 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 ); tqlayout->addWidget( lbl ); @@ -284,7 +284,7 @@ void KCMDesignerFields::initGUI() mPageView->setFullWidth( true ); hbox->addWidget( mPageView ); - TQGroupBox *box = new TQGroupBox(1, Qt::Horizontal, i18n("Preview of Selected Page"), this ); + TQGroupBox *box = new TQGroupBox(1, TQt::Horizontal, i18n("Preview of Selected Page"), this ); mPagePreview = new TQLabel( box ); mPagePreview->setMinimumWidth( 300 ); @@ -301,11 +301,11 @@ void KCMDesignerFields::initGUI() " Elements ('<i>Widgets</i>') to store your own values" " into %1. Proceed as described below:</p>" "<ol>" - "<li>Click on '<i>Edit with Qt Designer</i>'" + "<li>Click on '<i>Edit with TQt Designer</i>'" "<li>In the dialog, select '<i>Widget</i>', then click <i>OK</i>" "<li>Add your widgets to the form" - "<li>Save the file in the directory proposed by Qt Designer" - "<li>Close Qt Designer" + "<li>Save the file in the directory proposed by TQt Designer" + "<li>Close TQt Designer" "</ol>" "<p>In case you already have a designer file (*.ui) located" " somewhere on your hard disk, simply choose '<i>Import Page</i>'</p>" @@ -315,7 +315,7 @@ void KCMDesignerFields::initGUI() " <i>name</i> property to '<i>X_Foo</i>'.</p>" "<p><b>Important:</b> The widget will edit custom fields with an" " application name of %2. To change the application name" - " to be edited, set the widget name in Qt Designer.</p></qt>" ) + " to be edited, set the widget name in TQt Designer.</p></qt>" ) .arg( applicationName(), applicationName() ); KActiveLabel *activeLabel = new KActiveLabel( @@ -332,7 +332,7 @@ void KCMDesignerFields::initGUI() hbox->addWidget( mDeleteButton ); mImportButton = new TQPushButton( i18n( "Import Page..." ), this); hbox->addWidget( mImportButton ); - mDesignerButton = new TQPushButton( i18n( "Edit with Qt Designer..." ), this ); + mDesignerButton = new TQPushButton( i18n( "Edit with TQt Designer..." ), this ); hbox->addWidget( mDesignerButton ); if ( noDesigner ) @@ -353,7 +353,7 @@ void KCMDesignerFields::updatePreview( TQListViewItem *item ) bool widgetItemSelected = false; if ( item ) { - if ( item->parent() ) { + if ( item->tqparent() ) { TQString details = TQString( "<qt><table>" "<tr><td align=\"right\"><b>%1</b></td><td>%2</td></tr>" "<tr><td align=\"right\"><b>%3</b></td><td>%4</td></tr>" @@ -371,10 +371,10 @@ void KCMDesignerFields::updatePreview( TQListViewItem *item ) mPageDetails->setText( details ); - PageItem *pageItem = static_cast<PageItem*>( item->parent() ); + PageItem *pageItem = static_cast<PageItem*>( item->tqparent() ); mPagePreview->setPixmap( pageItem->preview() ); } else { - mPageDetails->setText( TQString::null ); + mPageDetails->setText( TQString() ); PageItem *pageItem = static_cast<PageItem*>( item ); mPagePreview->setPixmap( pageItem->preview() ); @@ -386,7 +386,7 @@ void KCMDesignerFields::updatePreview( TQListViewItem *item ) } else { mPagePreview->setPixmap( TQPixmap() ); mPagePreview->setFrameStyle( 0 ); - mPageDetails->setText( TQString::null ); + mPageDetails->setText( TQString() ); } mDeleteButton->setEnabled( widgetItemSelected ); @@ -394,7 +394,7 @@ void KCMDesignerFields::updatePreview( TQListViewItem *item ) void KCMDesignerFields::itemClicked( TQListViewItem *item ) { - if ( !item || item->parent() != 0 ) + if ( !item || item->tqparent() != 0 ) return; PageItem *pageItem = static_cast<PageItem*>( item ); @@ -420,7 +420,7 @@ void KCMDesignerFields::startDesigner() TQListViewItem *item = mPageView->selectedItem(); if ( item ) { - PageItem *pageItem = static_cast<PageItem*>( item->parent() ? item->parent() : item ); + PageItem *pageItem = static_cast<PageItem*>( item->tqparent() ? item->tqparent() : item ); cmdLine += " " + KProcess::quote( pageItem->path() ); } diff --git a/libkdepim/kcmdesignerfields.h b/libkdepim/kcmdesignerfields.h index 453730f94..e2e5d5a56 100644 --- a/libkdepim/kcmdesignerfields.h +++ b/libkdepim/kcmdesignerfields.h @@ -36,9 +36,10 @@ namespace KPIM { class KDE_EXPORT KCMDesignerFields : public KCModule { Q_OBJECT + TQ_OBJECT public: - KCMDesignerFields( TQWidget *parent = 0, const char *name = 0 ); + KCMDesignerFields( TQWidget *tqparent = 0, const char *name = 0 ); virtual void load(); virtual void save(); diff --git a/libkdepim/kconfigpropagator.cpp b/libkdepim/kconfigpropagator.cpp index 0f59c2a00..aea940892 100644 --- a/libkdepim/kconfigpropagator.cpp +++ b/libkdepim/kconfigpropagator.cpp @@ -159,9 +159,9 @@ void KConfigPropagator::parseConfigEntryPath( const TQString &path, if ( p.count() != 3 ) { kdError() << "Path has to be of form file/group/entry" << endl; - file = TQString::null; - group = TQString::null; - entry = TQString::null; + file = TQString(); + group = TQString(); + entry = TQString(); return; } diff --git a/libkdepim/kconfigpropagator.h b/libkdepim/kconfigpropagator.h index 9b3c1a6f6..1bad22506 100644 --- a/libkdepim/kconfigpropagator.h +++ b/libkdepim/kconfigpropagator.h @@ -99,8 +99,8 @@ class KDE_EXPORT KConfigPropagator void setTitle( const TQString &title ) { mTitle = title; } TQString title() const { return mTitle; } - virtual TQString arg1() const { return TQString::null; } - virtual TQString arg2() const { return TQString::null; } + virtual TQString arg1() const { return TQString(); } + virtual TQString arg2() const { return TQString(); } virtual void apply() = 0; diff --git a/libkdepim/kconfigwizard.cpp b/libkdepim/kconfigwizard.cpp index 6db0f9992..99aa0b598 100644 --- a/libkdepim/kconfigwizard.cpp +++ b/libkdepim/kconfigwizard.cpp @@ -31,18 +31,18 @@ #include <tqlayout.h> #include <tqtimer.h> -KConfigWizard::KConfigWizard( TQWidget *parent, +KConfigWizard::KConfigWizard( TQWidget *tqparent, char *name, bool modal ) - : KDialogBase( TreeList, i18n("Configuration Wizard"), Ok|Cancel, Ok, parent, + : KDialogBase( TreeList, i18n("Configuration Wizard"), Ok|Cancel, Ok, tqparent, name, modal ), mPropagator( 0 ), mChangesPage( 0 ) { init(); } -KConfigWizard::KConfigWizard( KConfigPropagator *propagator, TQWidget *parent, +KConfigWizard::KConfigWizard( KConfigPropagator *propagator, TQWidget *tqparent, char *name, bool modal ) - : KDialogBase( TreeList, i18n("Configuration Wizard"), Ok|Cancel, Ok, parent, + : KDialogBase( TreeList, i18n("Configuration Wizard"), Ok|Cancel, Ok, tqparent, name, modal ), mPropagator( propagator ), mChangesPage( 0 ) { diff --git a/libkdepim/kconfigwizard.h b/libkdepim/kconfigwizard.h index e5e6337e2..290b55e3e 100644 --- a/libkdepim/kconfigwizard.h +++ b/libkdepim/kconfigwizard.h @@ -33,16 +33,17 @@ class TQListView; class KDE_EXPORT KConfigWizard : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** Create wizard. You have to set a propgator with setPropagator() later. */ - KConfigWizard( TQWidget *parent = 0, char *name = 0, bool modal = false ); + KConfigWizard( TQWidget *tqparent = 0, char *name = 0, bool modal = false ); /** Create wizard for given KConfigPropagator. The wizard takes ownership of the propagator. */ - KConfigWizard( KConfigPropagator *propagator, TQWidget *parent = 0, + KConfigWizard( KConfigPropagator *propagator, TQWidget *tqparent = 0, char *name = 0, bool modal = false ); /** Destructor. @@ -78,9 +79,9 @@ class KDE_EXPORT KConfigWizard : public KDialogBase /** Validates the supplied data. Returns a appropiate error when some data - is invalid. Return TQString::null if all data is valid. + is invalid. Return TQString() if all data is valid. */ - virtual TQString validate() { return TQString::null; } + virtual TQString validate() { return TQString(); } protected slots: void readConfig(); diff --git a/libkdepim/kdateedit.cpp b/libkdepim/kdateedit.cpp index c4221556c..1d54920d6 100644 --- a/libkdepim/kdateedit.cpp +++ b/libkdepim/kdateedit.cpp @@ -34,11 +34,11 @@ #include "kdateedit.h" -class DateValidator : public QValidator +class DateValidator : public TQValidator { public: - DateValidator( const TQStringList &keywords, TQWidget* parent, const char* name = 0 ) - : TQValidator( parent, name ), mKeywords( keywords ) + DateValidator( const TQStringList &keywords, TQWidget* tqparent, const char* name = 0 ) + : TQValidator( tqparent, name ), mKeywords( keywords ) {} virtual State validate( TQString &str, int& ) const @@ -64,8 +64,8 @@ class DateValidator : public QValidator TQStringList mKeywords; }; -KDateEdit::KDateEdit( TQWidget *parent, const char *name ) - : TQComboBox( true, parent, name ), +KDateEdit::KDateEdit( TQWidget *tqparent, const char *name ) + : TQComboBox( true, tqparent, name ), mReadOnly( false ), mDiscardNextMousePress( false ) { @@ -163,7 +163,7 @@ void KDateEdit::popup() // 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 tqcontains the date currently displayed. + // First, ensure that the list box contains the date currently displayed. TQDate date = parseDate(); assignDate( date ); updateView(); @@ -171,7 +171,7 @@ void KDateEdit::popup() TQListBox *lb = listBox(); if (lb) { lb->setCurrentItem(0); - TQKeyEvent* keyEvent = new TQKeyEvent(TQEvent::KeyPress, Qt::Key_Enter, 0, 0); + TQKeyEvent* keyEvent = new TQKeyEvent(TQEvent::KeyPress, TQt::Key_Enter, 0, 0); TQApplication::postEvent(lb, keyEvent); } } @@ -191,12 +191,12 @@ void KDateEdit::dateSelected( TQDate date ) void KDateEdit::lineEnterPressed() { - bool tqreplaced = false; + bool replaced = false; - TQDate date = parseDate( &tqreplaced ); + TQDate date = parseDate( &replaced ); if (assignDate( date ) ) { - if ( tqreplaced ) + if ( replaced ) updateView(); emit dateChanged( date ); @@ -204,13 +204,13 @@ void KDateEdit::lineEnterPressed() } } -TQDate KDateEdit::parseDate( bool *tqreplaced ) const +TQDate KDateEdit::parseDate( bool *replaced ) const { TQString text = currentText(); TQDate result; - if ( tqreplaced ) - (*tqreplaced) = false; + if ( replaced ) + (*replaced) = false; if ( text.isEmpty() ) result = TQDate(); @@ -235,8 +235,8 @@ TQDate KDateEdit::parseDate( bool *tqreplaced ) const } result = today.addDays( i ); - if ( tqreplaced ) - (*tqreplaced) = true; + if ( replaced ) + (*replaced) = true; } else { result = KGlobal::locale()->readDate( text ); } @@ -256,15 +256,15 @@ bool KDateEdit::eventFilter( TQObject *object, TQEvent *event ) // Up and down arrow keys step the date TQKeyEvent* keyEvent = (TQKeyEvent*)event; - if ( keyEvent->key() == Qt::Key_Return ) { + if ( keyEvent->key() == TQt::Key_Return ) { lineEnterPressed(); return true; } int step = 0; - if ( keyEvent->key() == Qt::Key_Up ) + if ( keyEvent->key() == TQt::Key_Up ) step = 1; - else if ( keyEvent->key() == Qt::Key_Down ) + else if ( keyEvent->key() == TQt::Key_Down ) step = -1; // TODO: If it's not an input key, but something like Return, Enter, Tab, etc..., don't eat the keypress, but handle it through to the default eventfilter! if ( step && !mReadOnly ) { @@ -307,7 +307,7 @@ bool KDateEdit::eventFilter( TQObject *object, TQEvent *event ) void KDateEdit::mousePressEvent( TQMouseEvent *event ) { - if ( event->button() == Qt::LeftButton && mDiscardNextMousePress ) { + if ( event->button() == TQt::LeftButton && mDiscardNextMousePress ) { mDiscardNextMousePress = false; return; } diff --git a/libkdepim/kdateedit.h b/libkdepim/kdateedit.h index 0adb6ee56..cde85b0f9 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 tqcontains the date in text form, and clicking the combo + The combo box contains 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 @@ -51,12 +51,13 @@ class TQEvent; @author David Jarvie <software@astrojar.org.uk> @author Tobias Koenig <tokoe@kde.org> */ -class KDE_EXPORT KDateEdit : public QComboBox +class KDE_EXPORT KDateEdit : public TQComboBox { Q_OBJECT + TQ_OBJECT public: - KDateEdit( TQWidget *parent = 0, const char *name = 0 ); + KDateEdit( TQWidget *tqparent = 0, const char *name = 0 ); virtual ~KDateEdit(); /** diff --git a/libkdepim/kdatepickerpopup.cpp b/libkdepim/kdatepickerpopup.cpp index 8e3f36953..7d1f64272 100644 --- a/libkdepim/kdatepickerpopup.cpp +++ b/libkdepim/kdatepickerpopup.cpp @@ -26,9 +26,9 @@ #include "kdatepickerpopup.h" -KDatePickerPopup::KDatePickerPopup( int items, const TQDate &date, TQWidget *parent, +KDatePickerPopup::KDatePickerPopup( int items, const TQDate &date, TQWidget *tqparent, const char *name ) - : TQPopupMenu( parent, name ) + : TQPopupMenu( tqparent, name ) { mItems = items; diff --git a/libkdepim/kdatepickerpopup.h b/libkdepim/kdatepickerpopup.h index 70ed6793f..4b5632804 100644 --- a/libkdepim/kdatepickerpopup.h +++ b/libkdepim/kdatepickerpopup.h @@ -42,9 +42,10 @@ @author Bram Schoenmakers <bram_s@softhome.net> */ -class KDE_EXPORT KDatePickerPopup: public QPopupMenu +class KDE_EXPORT KDatePickerPopup: public TQPopupMenu { Q_OBJECT + TQ_OBJECT public: enum { NoDate = 1, DatePicker = 2, Words = 4 }; @@ -53,11 +54,11 @@ class KDE_EXPORT KDatePickerPopup: public QPopupMenu @param items List of all desirable items, separated with a bitwise OR. @param date Initial date of datepicker-widget. - @param parent The object's parent. + @param tqparent The object's tqparent. @param name The object's name. */ KDatePickerPopup( int items = DatePicker, const TQDate &date = TQDate::tqcurrentDate(), - TQWidget *parent = 0, const char *name = 0 ); + TQWidget *tqparent = 0, const char *name = 0 ); /** @return A pointer to the private variable mDatePicker, an instance of diff --git a/libkdepim/kdepim.widgets b/libkdepim/kdepim.widgets index 21410ee61..2f1b5e24c 100644 --- a/libkdepim/kdepim.widgets +++ b/libkdepim/kdepim.widgets @@ -25,5 +25,5 @@ Group=Input (KDE-PIM) ToolTip=Time Edit Combobox (KDE-PIM) WhatsThis=A widget to enter a time. It can also be selected from a drop-down list. IncludeFile=libkdepim/ktimeedit.h -ConstructorArgs=(parent, QTime::currentTime(), name) +ConstructorArgs=(tqparent, QTime::currentTime(), name) Group=Input (KDE-PIM) diff --git a/libkdepim/kfileio.cpp b/libkdepim/kfileio.cpp index 6a7eea7c3..913ee2cc1 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 tqreplace it?") + str = i18n("File %1 exists.\nDo you want to replace it?") .arg(aFileName); rc = KMessageBox::warningContinueCancel(0, str, i18n("Save to File"), i18n("&Replace")); @@ -348,8 +348,8 @@ TQString checkAndCorrectPermissionsIfPossible( const TQString &toCheck, if ( !g.isReadable() ){ error.append(i18n("Folder %1 is inaccessible.").arg(toCheck) + "\n"); } else { - const QFileInfoList *list = g.entryInfoList(); - QFileInfoListIterator it( *list ); + const TQFileInfoList *list = g.entryInfoList(); + TQFileInfoListIterator it( *list ); TQFileInfo *fi; while ((fi = it.current()) != 0) { TQString newToCheck = toCheck + "/" + fi->fileName(); @@ -365,7 +365,7 @@ TQString checkAndCorrectPermissionsIfPossible( const TQString &toCheck, return error; } -bool checkAndCorrectPermissionsIfPossibleWithErrorHandling( TQWidget *parent, +bool checkAndCorrectPermissionsIfPossibleWithErrorHandling( TQWidget *tqparent, const TQString &toCheck, const bool recursive, const bool wantItReadable, const bool wantItWritable ) { @@ -376,7 +376,7 @@ bool checkAndCorrectPermissionsIfPossibleWithErrorHandling( TQWidget *parent, // it is just a warning. if ( !error.isEmpty() ) { kdDebug() << "checkPermissions found:" << error << endl; - KMessageBox::detailedSorry(parent, + KMessageBox::detailedSorry(tqparent, i18n("Some files or folders do not have " "the right permissions, please correct them " "manually."), diff --git a/libkdepim/kfileio.h b/libkdepim/kfileio.h index 99d4d1dce..8365f1e29 100644 --- a/libkdepim/kfileio.h +++ b/libkdepim/kfileio.h @@ -78,10 +78,10 @@ TQString checkAndCorrectPermissionsIfPossible( const TQString &toCheck, * all files and folders below. If the permissions are not ok, it tries to correct * them. If that fails then a warning with detailled information is given. * - * @param parent If parent is 0, then the message box becomes an - * application-global modal dialog box. If parent + * @param tqparent If tqparent is 0, then the message box becomes an + * application-global modal dialog box. If tqparent * is a widget, the message box becomes modal - * relative to parent. + * relative to tqparent. * @param toCheck The file or folder of which the permissions should * be checked. * @param recursive Set to true, it will check the contents of a folder @@ -97,7 +97,7 @@ TQString checkAndCorrectPermissionsIfPossible( const TQString &toCheck, * then the permissions are not ok and it was not possible to correct * all errors. */ -bool checkAndCorrectPermissionsIfPossibleWithErrorHandling( TQWidget *parent, +bool checkAndCorrectPermissionsIfPossibleWithErrorHandling( TQWidget *tqparent, const TQString &toCheck, const bool recursive, const bool wantItReadable, const bool wantItWritable ); } diff --git a/libkdepim/kfoldertree.cpp b/libkdepim/kfoldertree.cpp index 2bf6ca1be..0098adbb2 100644 --- a/libkdepim/kfoldertree.cpp +++ b/libkdepim/kfoldertree.cpp @@ -12,18 +12,18 @@ #include <tqstyle.h> //----------------------------------------------------------------------------- -KFolderTreeItem::KFolderTreeItem( KFolderTree *parent, const TQString & label, +KFolderTreeItem::KFolderTreeItem( KFolderTree *tqparent, const TQString & label, Protocol protocol, Type type ) - : KListViewItem( parent, label ), mProtocol( protocol ), mType( type ), + : KListViewItem( tqparent, label ), mProtocol( protocol ), mType( type ), mUnread(-1), mTotal(0), mSize(0), mFolderIsCloseToQuota( false ) { } //----------------------------------------------------------------------------- -KFolderTreeItem::KFolderTreeItem( KFolderTreeItem *parent, +KFolderTreeItem::KFolderTreeItem( KFolderTreeItem *tqparent, const TQString & label, Protocol protocol, Type type, int unread, int total ) - : KListViewItem( parent, label ), mProtocol( protocol ), mType( type ), + : KListViewItem( tqparent, label ), mProtocol( protocol ), mType( type ), mUnread( unread ), mTotal( total ), mSize(0), mFolderIsCloseToQuota( false ) { } @@ -149,7 +149,7 @@ void KFolderTreeItem::setUnreadCount( int aUnread ) mUnread = aUnread; - TQString unread = TQString::null; + TQString unread = TQString(); if (mUnread == 0) unread = "- "; else { @@ -168,7 +168,7 @@ void KFolderTreeItem::setTotalCount( int aTotal ) mTotal = aTotal; - TQString total = TQString::null; + TQString total = TQString(); if (mTotal == 0) total = "- "; else { @@ -269,7 +269,7 @@ void KFolderTreeItem::paintCell( TQPainter * p, const TQColorGroup & cg, // deal with the folder column if the unread column is not shown /* The below is exceedingly silly, but Ingo insists that the unread - * count that is shown in parenthesis after the folder name must + * count that is shown in tqparenthesis after the folder name must * be configurable in color. That means that paintCell needs to do * two painting passes which flickers. Since that flicker is not * needed when there is the unread column, special case that. */ @@ -359,8 +359,8 @@ void KFolderTreeItem::setFolderIsCloseToQuota( bool v ) //============================================================================= -KFolderTree::KFolderTree( TQWidget *parent, const char* name ) - : KListView( parent, name ), mUnreadIndex(-1), mTotalIndex(-1), mSizeIndex(-1) +KFolderTree::KFolderTree( TQWidget *tqparent, const char* name ) + : KListView( tqparent, name ), mUnreadIndex(-1), mTotalIndex(-1), mSizeIndex(-1) { // GUI-options setStyleDependantFrameWidth(); @@ -464,7 +464,7 @@ bool KFolderTree::acceptDrag( TQDropEvent* event ) const void KFolderTree::addUnreadColumn( const TQString & name, int width ) { mUnreadIndex = addColumn( name, width ); - setColumnAlignment( mUnreadIndex, tqApp->reverseLayout() ? Qt::AlignLeft : Qt::AlignRight ); + setColumnAlignment( mUnreadIndex, tqApp->reverseLayout() ? TQt::AlignLeft : TQt::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, tqApp->reverseLayout() ? Qt::AlignLeft : Qt::AlignRight ); + setColumnAlignment( mTotalIndex, tqApp->reverseLayout() ? TQt::AlignLeft : TQt::AlignRight ); header()->adjustHeaderSize(); } @@ -507,7 +507,7 @@ void KFolderTree::removeTotalColumn() void KFolderTree::addSizeColumn( const TQString & name, int width ) { mSizeIndex = addColumn( name, width ); - setColumnAlignment( mSizeIndex, tqApp->reverseLayout() ? Qt::AlignLeft : Qt::AlignRight ); + setColumnAlignment( mSizeIndex, tqApp->reverseLayout() ? TQt::AlignLeft : TQt::AlignRight ); header()->adjustHeaderSize(); } diff --git a/libkdepim/kfoldertree.h b/libkdepim/kfoldertree.h index 5ababa1cc..db0f8baf7 100644 --- a/libkdepim/kfoldertree.h +++ b/libkdepim/kfoldertree.h @@ -61,7 +61,7 @@ struct KPaintInfo { showTodo(false), showSpamHam(false), showWatchedIgnored(false), - showStatus(false), + showtqStatus(false), showSigned(false), showCrypto(false), showReceiver(false), @@ -108,7 +108,7 @@ struct KPaintInfo { bool showTodo; bool showSpamHam; bool showWatchedIgnored; - bool showStatus; + bool showtqStatus; bool showSigned; bool showCrypto; bool showReceiver; @@ -171,11 +171,11 @@ class KDE_EXPORT KFolderTreeItem : public KListViewItem }; /** constructs a root-item */ - KFolderTreeItem( KFolderTree *parent, const TQString & label=TQString::null, + KFolderTreeItem( KFolderTree *tqparent, const TQString & label=TQString(), Protocol protocol=NONE, Type type=Root ); /** constructs a child-item */ - KFolderTreeItem( KFolderTreeItem *parent, const TQString & label=TQString::null, + KFolderTreeItem( KFolderTreeItem *tqparent, const TQString & label=TQString(), Protocol protocol=NONE, Type type=Other, int unread=0, int total=0 ); /** compare */ @@ -242,9 +242,10 @@ class KDE_EXPORT KFolderTreeItem : public KListViewItem class KDE_EXPORT KFolderTree : public KListView { Q_OBJECT + TQ_OBJECT public: - KFolderTree( TQWidget *parent, const char *name=0 ); + KFolderTree( TQWidget *tqparent, const char *name=0 ); /** registers MIMETypes that are handled @param mimeType the name of the MIMEType diff --git a/libkdepim/kimportdialog.cpp b/libkdepim/kimportdialog.cpp index cb59200a6..904415982 100644 --- a/libkdepim/kimportdialog.cpp +++ b/libkdepim/kimportdialog.cpp @@ -130,7 +130,7 @@ TQString KImportColumn::convert() class ColumnItem : public TQListViewItem { public: - ColumnItem(KImportColumn *col,TQListView *parent) : TQListViewItem(parent), mColumn(col) + ColumnItem(KImportColumn *col,TQListView *tqparent) : TQListViewItem(tqparent), mColumn(col) { setText(0,mColumn->header()); } @@ -148,8 +148,8 @@ class ColumnItem : public TQListViewItem { data objects, this class has to be inherited by a special class, which reimplements the convertRow() function. */ -KImportDialog::KImportDialog(TQWidget* parent) - : KDialogBase(parent,"importdialog",true,i18n("Import Text File"),Ok|Cancel), +KImportDialog::KImportDialog(TQWidget* tqparent) + : KDialogBase(tqparent,"importdialog",true,i18n("Import Text File"),Ok|Cancel), mSeparator(","), mCurrentRow(0) { @@ -303,7 +303,7 @@ void KImportDialog::readFile( int rows ) mData.clear(); int row, column; - enum { S_START, S_QUOTED_FIELD, S_MAYBE_END_OF_QUOTED_FIELD, S_END_OF_QUOTED_FIELD, + enum { S_START, S_TQUOTED_FIELD, S_MAYBE_END_OF_TQUOTED_FIELD, S_END_OF_TQUOTED_FIELD, S_MAYBE_NORMAL_FIELD, S_NORMAL_FIELD } state = S_START; TQChar m_textquote = '"'; @@ -347,7 +347,7 @@ void KImportDialog::readFile( int rows ) case S_START : if (x == m_textquote) { field += x; - state = S_QUOTED_FIELD; + state = S_TQUOTED_FIELD; } else if (x == mSeparator) { ++column; } else if (x == '\n') { @@ -358,10 +358,10 @@ void KImportDialog::readFile( int rows ) state = S_MAYBE_NORMAL_FIELD; } break; - case S_QUOTED_FIELD : + case S_TQUOTED_FIELD : if (x == m_textquote) { field += x; - state = S_MAYBE_END_OF_QUOTED_FIELD; + state = S_MAYBE_END_OF_TQUOTED_FIELD; } else if (x == '\n') { setData(row - m_startline, column, field); field = ""; @@ -376,10 +376,10 @@ void KImportDialog::readFile( int rows ) field += x; } break; - case S_MAYBE_END_OF_QUOTED_FIELD : + case S_MAYBE_END_OF_TQUOTED_FIELD : if (x == m_textquote) { field += x; - state = S_QUOTED_FIELD; + state = S_TQUOTED_FIELD; } else if (x == mSeparator || x == '\n') { setData(row - m_startline, column, field); field = ""; @@ -391,10 +391,10 @@ void KImportDialog::readFile( int rows ) } state = S_START; } else { - state = S_END_OF_QUOTED_FIELD; + state = S_END_OF_TQUOTED_FIELD; } break; - case S_END_OF_QUOTED_FIELD : + case S_END_OF_TQUOTED_FIELD : if (x == mSeparator || x == '\n') { setData(row - m_startline, column, field); field = ""; @@ -406,13 +406,13 @@ void KImportDialog::readFile( int rows ) } state = S_START; } else { - state = S_END_OF_QUOTED_FIELD; + state = S_END_OF_TQUOTED_FIELD; } break; case S_MAYBE_NORMAL_FIELD : if (x == m_textquote) { field = ""; - state = S_QUOTED_FIELD; + state = S_TQUOTED_FIELD; } case S_NORMAL_FIELD : if (x == mSeparator || x == '\n') { @@ -443,7 +443,7 @@ void KImportDialog::setCellText(int row, int col, const TQString& text) if ((mTable->numRows() - 1) < row) mTable->setNumRows(row + 1); if ((mTable->numCols() - 1) < col) mTable->setNumCols(col + 1); - KImportColumn *c = mColumnDict.find(col); + KImportColumn *c = mColumnDict.tqfind(col); TQString formattedText; if (c) formattedText = c->preview(text,findFormat(col)); else formattedText = text; @@ -492,7 +492,7 @@ void KImportDialog::tableSelected() TQTableSelection selection = mTable->selection(mTable->currentSelection()); TQListViewItem *item = mHeaderList->firstChild(); - KImportColumn *col = mColumnDict.find(selection.leftCol()); + KImportColumn *col = mColumnDict.tqfind(selection.leftCol()); if (col) { while(item) { if (item->text(0) == col->header()) { @@ -633,7 +633,7 @@ void KImportDialog::removeColumn() for(int i=selection.leftCol();i<=selection.rightCol();++i) { if (i >= 0) { mTable->horizontalHeader()->setLabel(i,TQString::number(i+1)); - KImportColumn *col = mColumnDict.find(i); + KImportColumn *col = mColumnDict.tqfind(i); if (col) { mColumnDict.remove(i); mFormats.remove(i); @@ -674,7 +674,7 @@ void KImportDialog::applyConverter() int KImportDialog::findFormat(int column) { - TQMap<int,int>::ConstIterator formatIt = mFormats.find(column); + TQMap<int,int>::ConstIterator formatIt = mFormats.tqfind(column); int format; if (formatIt == mFormats.end()) format = KImportColumn::FormatUndefined; else format = *formatIt; @@ -713,7 +713,7 @@ void KImportDialog::setData( uint row, uint col, const TQString &value ) rowVector->resize( col + 1 ); } - KImportColumn *c = mColumnDict.find( col ); + KImportColumn *c = mColumnDict.tqfind( col ); if ( c ) rowVector->at( col ) = c->preview( val, findFormat(col) ); else diff --git a/libkdepim/kimportdialog.h b/libkdepim/kimportdialog.h index d7dd634eb..b16f335f6 100644 --- a/libkdepim/kimportdialog.h +++ b/libkdepim/kimportdialog.h @@ -76,8 +76,9 @@ class KImportColumn class KImportDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KImportDialog(TQWidget* parent); + KImportDialog(TQWidget* tqparent); public slots: bool setFile(const TQString& file); diff --git a/libkdepim/kincidencechooser.cpp b/libkdepim/kincidencechooser.cpp index 2cef98f3a..431d650de 100644 --- a/libkdepim/kincidencechooser.cpp +++ b/libkdepim/kincidencechooser.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqlayout.h> @@ -44,8 +44,8 @@ int KIncidenceChooser::chooseMode = KIncidenceChooser::ask ; -KIncidenceChooser::KIncidenceChooser(TQWidget *parent, char *name) : - KDialog(parent,name,true) +KIncidenceChooser::KIncidenceChooser(TQWidget *tqparent, char *name) : + KDialog(tqparent,name,true) { KDialog *topFrame = this; TQGridLayout *topLayout = new TQGridLayout(topFrame,5,3); @@ -104,7 +104,7 @@ KIncidenceChooser::KIncidenceChooser(TQWidget *parent, char *name) : #else mDiffBut = 0; #endif - mBg = new TQButtonGroup ( 1, Qt::Horizontal, i18n("Sync Preferences"), topFrame); + mBg = new TQButtonGroup ( 1, TQt::Horizontal, i18n("Sync Preferences"), topFrame); topLayout->addMultiCellWidget(mBg, iii,iii,0,2); ++iii; mBg->insert( new TQRadioButton ( i18n("Take local entry on conflict"), mBg ), KIncidenceChooser::local); diff --git a/libkdepim/kincidencechooser.h b/libkdepim/kincidencechooser.h index 9d9e016ad..4dc6b2ef1 100644 --- a/libkdepim/kincidencechooser.h +++ b/libkdepim/kincidencechooser.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef _KINCIDENCECHOOSER_H #define _KINCIDENCECHOOSER_H @@ -42,12 +42,13 @@ class TQButtonGroup; class KDE_EXPORT KIncidenceChooser : public KDialog { Q_OBJECT + TQ_OBJECT public: enum mode { local, remote, newest, ask, both }; /** Initialize dialog and pages */ - KIncidenceChooser( TQWidget *parent=0, char *name=0 ); + KIncidenceChooser( TQWidget *tqparent=0, char *name=0 ); ~KIncidenceChooser(); //void setChooseText( TQString ); void setIncidence( KCal::Incidence *, KCal::Incidence * ); diff --git a/libkdepim/kmailcompletion.cpp b/libkdepim/kmailcompletion.cpp index e7e9e17f2..98a3cb9ee 100644 --- a/libkdepim/kmailcompletion.cpp +++ b/libkdepim/kmailcompletion.cpp @@ -44,8 +44,8 @@ TQString KMailCompletion::makeCompletion( const TQString &string ) // this should be in postProcessMatch, but postProcessMatch is const and will not allow nextMatch if ( !match.isEmpty() ){ const TQString firstMatch( match ); - while ( match.find( TQRegExp( "(@)|(<.*>)" ) ) == -1 ) { - /* local email do not require @domain part, if match is an address we'll find + while ( match.tqfind( TQRegExp( "(@)|(<.*>)" ) ) == -1 ) { + /* local email do not require @domain part, if match is an address we'll tqfind * last+first <match> in m_keyMap and we'll know that match is already a valid email. * * Distribution list do not have last+first <match> entry, they will be in mailAddr @@ -53,7 +53,7 @@ TQString KMailCompletion::makeCompletion( const TQString &string ) const TQStringList &mailAddr = m_keyMap[ match ]; //get all mailAddr for this keyword bool isEmail = false; for ( TQStringList::ConstIterator sit ( mailAddr.begin() ), sEnd( mailAddr.end() ); sit != sEnd; ++sit ) - if ( (*sit).find( "<" + match + ">" ) != -1 || (*sit) == match ) { + if ( (*sit).tqfind( "<" + match + ">" ) != -1 || (*sit) == match ) { isEmail = true; break; } @@ -62,7 +62,7 @@ TQString KMailCompletion::makeCompletion( const TQString &string ) // match is a keyword, skip it and try to find match <email@domain> match = nextMatch(); if ( firstMatch == match ){ - match = TQString::null; + match = TQString(); break; } } else @@ -77,7 +77,7 @@ void KMailCompletion::addItemWithKeys( const TQString& email, int weight, const Q_ASSERT( keyWords != 0 ); for ( TQStringList::ConstIterator it( keyWords->begin() ); it != keyWords->end(); ++it ) { TQStringList &emailList = m_keyMap[ (*it) ]; //lookup email-list for given keyword - if ( emailList.find( email ) == emailList.end() ) //add email if not there + if ( emailList.tqfind( email ) == emailList.end() ) //add email if not there emailList.append( email ); addItem( (*it),weight ); //inform KCompletion about keyword } @@ -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 tqreplace with QSet in KDE4 + TQMap< TQString, bool > mailAddrDistinct; //TODO replace with TQSet 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 8f29d7e02..254507c19 100644 --- a/libkdepim/kmailcompletion.h +++ b/libkdepim/kmailcompletion.h @@ -36,6 +36,7 @@ namespace KPIM { class KMailCompletion : public KCompletion { Q_OBJECT + TQ_OBJECT public: KMailCompletion(); @@ -58,14 +59,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 tqcontains localpart@domain + * \li contains 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 tqreplace all keywords in pMatches whith corrsesponding email addresses. + * Uses an internal map to replace all keywords in pMatches whith corrsesponding email addresses. */ virtual void postProcessMatches( TQStringList * pMatches )const; diff --git a/libkdepim/komposer/core/attachment.cpp b/libkdepim/komposer/core/attachment.cpp index f8240380e..df803de60 100644 --- a/libkdepim/komposer/core/attachment.cpp +++ b/libkdepim/komposer/core/attachment.cpp @@ -61,50 +61,50 @@ Attachment::~Attachment() delete d; d = 0; } -QString +TQString Attachment::name() const { return d->name; } -QCString +TQCString Attachment::cte() const { return d->cte; } -QByteArray +TQByteArray Attachment::data() const { return d->data; } -QCString +TQCString Attachment::type() const { return d->type; } -QCString +TQCString Attachment::subType() const { return d->subType; } -QCString +TQCString Attachment::paramAttr() const { return d->paramAttr; } -QString +TQString Attachment::paramValue() const { return d->paramValue; } -QCString +TQCString Attachment::contentDisposition() const { return d->contDisp; diff --git a/libkdepim/komposer/core/core.cpp b/libkdepim/komposer/core/core.cpp index f93e59cc9..bffae60ed 100644 --- a/libkdepim/komposer/core/core.cpp +++ b/libkdepim/komposer/core/core.cpp @@ -53,9 +53,9 @@ using namespace Komposer; -Core::Core( TQWidget *parent, const char *name ) +Core::Core( TQWidget *tqparent, const char *name ) : KomposerIface( "KomposerIface" ), - KMainWindow( parent, name ), m_currentEditor( 0 ) + KMainWindow( tqparent, name ), m_currentEditor( 0 ) { initWidgets(); initCore(); @@ -158,7 +158,7 @@ Core::selectEditor( Komposer::Editor *editor ) TQPtrList<KParts::Part> *partList = const_cast<TQPtrList<KParts::Part>*>( m_partManager->parts() ); - if ( partList->find( part ) == -1 ) + if ( partList->tqfind( part ) == -1 ) addPart( part ); m_partManager->setActivePart( part ); diff --git a/libkdepim/komposer/core/core.h b/libkdepim/komposer/core/core.h index 91ef133e9..871d67a05 100644 --- a/libkdepim/komposer/core/core.h +++ b/libkdepim/komposer/core/core.h @@ -45,6 +45,7 @@ namespace Komposer class Core : public KMainWindow, virtual public KomposerIface { Q_OBJECT + TQ_OBJECT public: Core( TQWidget *tqparentWidget = 0, const char *name = 0 ); virtual ~Core(); diff --git a/libkdepim/komposer/core/corewidget.cpp b/libkdepim/komposer/core/corewidget.cpp index c65893766..53e8abd2c 100644 --- a/libkdepim/komposer/core/corewidget.cpp +++ b/libkdepim/komposer/core/corewidget.cpp @@ -24,8 +24,8 @@ using namespace Komposer; -CoreWidget::CoreWidget( TQWidget *parent, const char *name ) - : TQWidget( parent, name ) +CoreWidget::CoreWidget( TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ) { } diff --git a/libkdepim/komposer/core/corewidget.h b/libkdepim/komposer/core/corewidget.h index 8b07a0a7a..8c67e77d0 100644 --- a/libkdepim/komposer/core/corewidget.h +++ b/libkdepim/komposer/core/corewidget.h @@ -29,11 +29,12 @@ namespace Komposer { - class CoreWidget : public QWidget + class CoreWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - CoreWidget( TQWidget *parent, const char *name=0 ); + CoreWidget( TQWidget *tqparent, const char *name=0 ); virtual TQString subject() const =0; virtual TQStringList to() const =0; diff --git a/libkdepim/komposer/core/editor.cpp b/libkdepim/komposer/core/editor.cpp index 5dada393f..d9ecbd56e 100644 --- a/libkdepim/komposer/core/editor.cpp +++ b/libkdepim/komposer/core/editor.cpp @@ -30,8 +30,8 @@ public: TQString id; }; -Editor::Editor( TQObject *parent, const char *name, const TQStringList &args ) - : Plugin( parent, name, args ), d( new Private ) +Editor::Editor( TQObject *tqparent, const char *name, const TQStringList &args ) + : Plugin( tqparent, name, args ), d( new Private ) { } diff --git a/libkdepim/komposer/core/editor.h b/libkdepim/komposer/core/editor.h index a5b78915d..9cc9336dd 100644 --- a/libkdepim/komposer/core/editor.h +++ b/libkdepim/komposer/core/editor.h @@ -38,6 +38,7 @@ namespace Komposer { class Editor : public Plugin { Q_OBJECT + TQ_OBJECT public: enum TextType { Plain = 1 << 0, @@ -92,7 +93,7 @@ namespace Komposer { virtual void changeSignature( const TQString &txt ) =0; protected: - Editor( TQObject *parent, const char *name, const TQStringList &args ); + Editor( TQObject *tqparent, const char *name, const TQStringList &args ); private: class Private; diff --git a/libkdepim/komposer/core/plugin.cpp b/libkdepim/komposer/core/plugin.cpp index 41af47cd9..dbadaff59 100644 --- a/libkdepim/komposer/core/plugin.cpp +++ b/libkdepim/komposer/core/plugin.cpp @@ -35,8 +35,8 @@ public: //Core* core; }; -Plugin::Plugin( TQObject *parent, const char *name, const TQStringList & ) - : TQObject( parent, name ), d( new Private ) +Plugin::Plugin( TQObject *tqparent, const char *name, const TQStringList & ) + : TQObject( tqparent, name ), d( new Private ) { //d->core = core; } diff --git a/libkdepim/komposer/core/plugin.h b/libkdepim/komposer/core/plugin.h index 2dddd09f4..bb62f3224 100644 --- a/libkdepim/komposer/core/plugin.h +++ b/libkdepim/komposer/core/plugin.h @@ -33,6 +33,7 @@ namespace Komposer virtual public KXMLGUIClient { Q_OBJECT + TQ_OBJECT public: virtual ~Plugin(); @@ -63,7 +64,7 @@ namespace Komposer Core *core() const; protected: friend class PluginManager; - Plugin( TQObject *parent, const char *name, const TQStringList& args = TQStringList() ); + Plugin( TQObject *tqparent, const char *name, const TQStringList& args = TQStringList() ); private: class Private; diff --git a/libkdepim/komposer/core/pluginmanager.cpp b/libkdepim/komposer/core/pluginmanager.cpp index d4fd5acc8..d46d471b2 100644 --- a/libkdepim/komposer/core/pluginmanager.cpp +++ b/libkdepim/komposer/core/pluginmanager.cpp @@ -66,8 +66,8 @@ public: TQValueStack<TQString> pluginsToLoad; }; -PluginManager::PluginManager( TQObject *parent ) - : TQObject( parent ) +PluginManager::PluginManager( TQObject *tqparent ) + : TQObject( tqparent ) { d = new Private; @@ -414,7 +414,7 @@ PluginManager::plugin( const TQString &pluginId ) const return 0; } -QString +TQString PluginManager::pluginName( const Plugin *plugin ) const { TQMap<KPluginInfo*, Plugin*>::ConstIterator it; @@ -427,7 +427,7 @@ PluginManager::pluginName( const Plugin *plugin ) const return TQString::tqfromLatin1( "Unknown" ); } -QString +TQString PluginManager::pluginId( const Plugin *plugin ) const { TQMap<KPluginInfo*, Plugin*>::ConstIterator it; @@ -440,7 +440,7 @@ PluginManager::pluginId( const Plugin *plugin ) const return TQString::tqfromLatin1( "unknown" ); } -QString +TQString PluginManager::pluginIcon( const Plugin *plugin ) const { TQMap<KPluginInfo*, Plugin*>::ConstIterator it; diff --git a/libkdepim/komposer/core/pluginmanager.h b/libkdepim/komposer/core/pluginmanager.h index 179cf48de..34cc6b9c5 100644 --- a/libkdepim/komposer/core/pluginmanager.h +++ b/libkdepim/komposer/core/pluginmanager.h @@ -37,9 +37,10 @@ namespace Komposer class Plugin; - class PluginManager : public QObject + class PluginManager : public TQObject { Q_OBJECT + TQ_OBJECT public: PluginManager( TQObject * ); @@ -57,7 +58,7 @@ namespace Komposer * interface. */ TQValueList<KPluginInfo*> availablePlugins( const TQString &category - = TQString::null ) const; + = TQString() ) const; /** * Returns a list of all plugins that are actually loaded. @@ -65,7 +66,7 @@ namespace Komposer * See also @ref availablePlugins(). */ TQMap<KPluginInfo*, Plugin*> loadedPlugins( const TQString &category - = TQString::null ) const; + = TQString() ) const; /** * @brief Search by plugin name. This is the key used as X-KDE-PluginInfo-Name diff --git a/libkdepim/komposer/core/prefsmodule.cpp b/libkdepim/komposer/core/prefsmodule.cpp index 3536ebb8e..1c088e9e8 100644 --- a/libkdepim/komposer/core/prefsmodule.cpp +++ b/libkdepim/komposer/core/prefsmodule.cpp @@ -35,14 +35,14 @@ extern "C" { - KDE_EXPORT KCModule *create_komposerconfig( TQWidget *parent, const char * ) { - return new Komposer::PrefsModule( parent, "komposerprefs" ); + KDE_EXPORT KCModule *create_komposerconfig( TQWidget *tqparent, const char * ) { + return new Komposer::PrefsModule( tqparent, "komposerprefs" ); } } using namespace Komposer; -PrefsModule::PrefsModule( TQWidget *parent, const char *name ) - : KPrefsModule( Komposer::Prefs::self(), parent, name ) +PrefsModule::PrefsModule( TQWidget *tqparent, const char *name ) + : KPrefsModule( Komposer::Prefs::self(), tqparent, name ) { TQVBoxLayout *topLayout = new TQVBoxLayout( this ); @@ -71,12 +71,12 @@ PrefsModule::aboutData() const EditorSelection::EditorSelection( const TQString &text, TQString &reference, - TQWidget *parent ) + TQWidget *tqparent ) : m_reference( reference ) { - m_box = new TQGroupBox( 0, Qt::Vertical, text, parent ); + m_box = new TQGroupBox( 0, TQt::Vertical, text, tqparent ); TQVBoxLayout *boxLayout = new TQVBoxLayout( m_box->tqlayout() ); - boxLayout->tqsetAlignment( Qt::AlignTop ); + boxLayout->tqsetAlignment( TQt::AlignTop ); m_editorsCombo = new KComboBox( m_box ); boxLayout->addWidget( m_editorsCombo ); diff --git a/libkdepim/komposer/core/prefsmodule.h b/libkdepim/komposer/core/prefsmodule.h index b213258ba..ab1744044 100644 --- a/libkdepim/komposer/core/prefsmodule.h +++ b/libkdepim/komposer/core/prefsmodule.h @@ -35,17 +35,19 @@ namespace Komposer { class PrefsModule : public KPrefsModule { Q_OBJECT + TQ_OBJECT public: - PrefsModule( TQWidget *parent=0, const char *name=0 ); + PrefsModule( TQWidget *tqparent=0, const char *name=0 ); virtual const KAboutData *aboutData() const; }; class EditorSelection : public KPrefsWid { Q_OBJECT + TQ_OBJECT public: - EditorSelection( const TQString &text, TQString &reference, TQWidget *parent ); + EditorSelection( const TQString &text, TQString &reference, TQWidget *tqparent ); ~EditorSelection(); void readConfig(); diff --git a/libkdepim/komposer/core/tests/managertest.cpp b/libkdepim/komposer/core/tests/managertest.cpp index 487a84c59..4224a2e24 100644 --- a/libkdepim/komposer/core/tests/managertest.cpp +++ b/libkdepim/komposer/core/tests/managertest.cpp @@ -23,8 +23,8 @@ #include "pluginmanager.h" using namespace Komposer; -ManagerTest::ManagerTest( TQObject* parent ) - : TQObject( parent ) +ManagerTest::ManagerTest( TQObject* tqparent ) + : TQObject( tqparent ) { m_manager = new PluginManager( this ); } diff --git a/libkdepim/komposer/core/tests/managertest.h b/libkdepim/komposer/core/tests/managertest.h index 397bfaf01..c0351b39f 100644 --- a/libkdepim/komposer/core/tests/managertest.h +++ b/libkdepim/komposer/core/tests/managertest.h @@ -32,8 +32,9 @@ class ManagerTest : public TQObject, public Tester { Q_OBJECT + TQ_OBJECT public: - ManagerTest( TQObject* parent = 0 ); + ManagerTest( TQObject* tqparent = 0 ); public slots: void allTests(); diff --git a/libkdepim/komposer/core/tests/tester.cpp b/libkdepim/komposer/core/tests/tester.cpp index b32c89644..2a0c84618 100644 --- a/libkdepim/komposer/core/tests/tester.cpp +++ b/libkdepim/komposer/core/tests/tester.cpp @@ -21,8 +21,8 @@ #include "tester.h" -Tester::Tester( TQObject* parent ) - : TQObject( parent ) +Tester::Tester( TQObject* tqparent ) + : TQObject( tqparent ) { } diff --git a/libkdepim/komposer/core/tests/testmanager.cpp b/libkdepim/komposer/core/tests/testmanager.cpp index 0fcba16b9..893b35b81 100644 --- a/libkdepim/komposer/core/tests/testmanager.cpp +++ b/libkdepim/komposer/core/tests/testmanager.cpp @@ -11,8 +11,8 @@ using namespace Komposer; -TestManager::TestManager( TQObject *parent ) - : TQObject( parent ) +TestManager::TestManager( TQObject *tqparent ) + : TQObject( tqparent ) { m_manager = new PluginManager( this ); connect( m_manager, TQT_SIGNAL(pluginLoaded(Plugin*)), diff --git a/libkdepim/komposer/core/tests/testmanager.h b/libkdepim/komposer/core/tests/testmanager.h index c5ff8517d..b574bc871 100644 --- a/libkdepim/komposer/core/tests/testmanager.h +++ b/libkdepim/komposer/core/tests/testmanager.h @@ -9,11 +9,12 @@ namespace Komposer { } using Komposer::Plugin; -class TestManager : public QObject +class TestManager : public TQObject { Q_OBJECT + TQ_OBJECT public: - TestManager( TQObject *parent ); + TestManager( TQObject *tqparent ); public slots: void slotPluginLoaded( Plugin *plugin ); diff --git a/libkdepim/komposer/plugins/default/defaulteditor.cpp b/libkdepim/komposer/plugins/default/defaulteditor.cpp index 56f97d223..6f7dcb7df 100644 --- a/libkdepim/komposer/plugins/default/defaulteditor.cpp +++ b/libkdepim/komposer/plugins/default/defaulteditor.cpp @@ -36,7 +36,7 @@ #include <kprinter.h> #include <kfinddialog.h> #include <kfind.h> -#include <ktqreplacedialog.h> +#include <kreplacedialog.h> #include <ktqreplace.h> #include <tqtextedit.h> @@ -46,8 +46,8 @@ typedef KGenericFactory<DefaultEditor> DefaultEditorFactory; K_EXPORT_COMPONENT_FACTORY( libkomposer_defaulteditor, DefaultEditorFactory( "komposer_defaulteditor" ) ) -DefaultEditor::DefaultEditor( TQObject *parent, const char *name, const TQStringList &args ) - : Editor( parent, name, args ), m_textEdit( 0 ) +DefaultEditor::DefaultEditor( TQObject *tqparent, const char *name, const TQStringList &args ) + : Editor( tqparent, name, args ), m_textEdit( 0 ) { setInstance( DefaultEditorFactory::instance() ); @@ -69,7 +69,7 @@ DefaultEditor::widget() return m_textEdit; } -QString +TQString DefaultEditor::text() const { return m_textEdit->text(); diff --git a/libkdepim/komposer/plugins/default/defaulteditor.h b/libkdepim/komposer/plugins/default/defaulteditor.h index a877b762a..7c33bb334 100644 --- a/libkdepim/komposer/plugins/default/defaulteditor.h +++ b/libkdepim/komposer/plugins/default/defaulteditor.h @@ -34,8 +34,9 @@ class KActionCollection; class DefaultEditor : public Komposer::Editor { Q_OBJECT + TQ_OBJECT public: - DefaultEditor( TQObject *parent, const char *name, const TQStringList &args ); + DefaultEditor( TQObject *tqparent, const char *name, const TQStringList &args ); ~DefaultEditor(); virtual TQWidget *widget(); diff --git a/libkdepim/komposer/plugins/default/defaulteditorui.rc b/libkdepim/komposer/plugins/default/defaulteditorui.rc index 479fa8b06..de8c2e6d2 100644 --- a/libkdepim/komposer/plugins/default/defaulteditorui.rc +++ b/libkdepim/komposer/plugins/default/defaulteditorui.rc @@ -24,7 +24,7 @@ <Action name="format_color"/> <DefineGroup name="format_chars_group" /> <Separator/> - <Menu name="alignment"><text>&Alignment</text> + <Menu name="tqalignment"><text>&Alignment</text> <Action name="format_align_left"/> <Action name="format_align_center"/> <Action name="format_align_right"/> diff --git a/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp b/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp index 922e51261..b25e50355 100644 --- a/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp +++ b/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp @@ -47,8 +47,8 @@ void KPartsGenericPart::load() if ( m_part ) { delete m_part; } - // "this" is both the parent widget and the parent object - m_part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString::null, this, 0, this, 0 ); + // "this" is both the tqparent widget and the tqparent object + m_part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString(), this, 0, this, 0 ); if ( m_part ) { m_part->openURL( m_url ); m_part->widget()->show(); @@ -63,16 +63,16 @@ TQStringList KPartsWidgetPlugin::keys() const { return TQStringList() << mykey; } -TQWidget * KPartsWidgetPlugin::create( const TQString & key, TQWidget * parent, const char * name ) { +TQWidget * KPartsWidgetPlugin::create( const TQString & key, TQWidget * tqparent, const char * name ) { if ( key == mykey ) - return new KPartsGenericPart( parent, name ); + return new KPartsGenericPart( tqparent, name ); return 0; } TQString KPartsWidgetPlugin::group( const TQString & key ) const { if ( key == mykey ) return "Display (KDE)"; - return TQString::null; + return TQString(); } #if 0 @@ -84,19 +84,19 @@ TQIconSet KPartsWidgetPlugin::iconSet( const TQString & key ) const { TQString KPartsWidgetPlugin::includeFile( const TQString & key ) const { if ( key == mykey ) return "partplugin.h"; - return TQString::null; + return TQString(); } TQString KPartsWidgetPlugin::toolTip( const TQString & key ) const { if ( key == mykey ) return "Generic KParts viewer"; - return TQString::null; + return TQString(); } TQString KPartsWidgetPlugin::whatsThis( const TQString & key ) const { if ( key == mykey ) return "A widget to embed any KParts viewer, given a url and optionally a mimetype"; - return TQString::null; + return TQString(); } bool KPartsWidgetPlugin::isContainer( const TQString & /*key*/ ) const { @@ -104,14 +104,14 @@ bool KPartsWidgetPlugin::isContainer( const TQString & /*key*/ ) const { } /// Duplicated from kdelibs/kdecore/kdemacros.h.in for those with kdelibs < 3.4 -#ifndef KDE_Q_EXPORT_PLUGIN -#define KDE_Q_EXPORT_PLUGIN(PLUGIN) \ - Q_EXTERN_C KDE_EXPORT const char* qt_ucm_query_verification_data(); \ - Q_EXTERN_C KDE_EXPORT QUnknownInterface* ucm_instantiate(); \ - Q_EXPORT_PLUGIN(PLUGIN) +#ifndef KDE_TQ_EXPORT_PLUGIN +#define KDE_TQ_EXPORT_PLUGIN(PLUGIN) \ + TQ_EXTERN_C KDE_EXPORT const char* qt_ucm_query_verification_data(); \ + TQ_EXTERN_C KDE_EXPORT TQUnknownInterface* ucm_instantiate(); \ + TQ_EXPORT_PLUGIN(PLUGIN) #endif -KDE_Q_EXPORT_PLUGIN( KPartsWidgetPlugin ) +KDE_TQ_EXPORT_PLUGIN( KPartsWidgetPlugin ) #include "kpartsdesignerplugin.moc" diff --git a/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.h b/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.h index 1302b137d..0a37f2f80 100644 --- a/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.h +++ b/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.h @@ -31,8 +31,9 @@ namespace KParts { class ReadOnlyPart; } */ class KPartsGenericPart : public TQWidget { Q_OBJECT - Q_PROPERTY( TQString url READ url WRITE setURL ) - Q_PROPERTY( TQString mimetype READ mimetype WRITE setMimetype ) + TQ_OBJECT + TQ_PROPERTY( TQString url READ url WRITE setURL ) + TQ_PROPERTY( TQString mimetype READ mimetype WRITE setMimetype ) public: KPartsGenericPart( TQWidget* tqparentWidget, const char* name ); @@ -53,12 +54,12 @@ private: }; /** - * Qt designer plugin for embedding a KParts using KPartsGenericPart + * TQt designer plugin for embedding a KParts using KPartsGenericPart */ class KPartsWidgetPlugin : public TQWidgetPlugin { public: TQStringList keys() const; - TQWidget * create( const TQString & key, TQWidget * parent, const char * name ); + TQWidget * create( const TQString & key, TQWidget * tqparent, const char * name ); TQString group( const TQString & key ) const; //TQIconSet iconSet( const TQString & key ) const; TQString includeFile( const TQString & key ) const; diff --git a/libkdepim/kpimprefs.cpp b/libkdepim/kpimprefs.cpp index 730ed8f52..55a6a799f 100644 --- a/libkdepim/kpimprefs.cpp +++ b/libkdepim/kpimprefs.cpp @@ -79,7 +79,7 @@ const TQString KPimPrefs::timezone() int len = readlink( "/etc/localtime", zonefilebuf, PATH_MAX ); if ( len > 0 && len < PATH_MAX ) { zone = TQString::fromLocal8Bit( zonefilebuf, len ); - zone = zone.mid( zone.find( "zoneinfo/" ) + 9 ); + zone = zone.mid( zone.tqfind( "zoneinfo/" ) + 9 ); kdDebug(5300) << "system timezone from /etc/localtime is " << zone << endl; } else { diff --git a/libkdepim/kpimprefs.h b/libkdepim/kpimprefs.h index 90d5be866..cd1202aba 100644 --- a/libkdepim/kpimprefs.h +++ b/libkdepim/kpimprefs.h @@ -31,7 +31,7 @@ class TQString; class KDE_EXPORT KPimPrefs : public KConfigSkeleton { public: - KPimPrefs( const TQString &name = TQString::null ); + KPimPrefs( const TQString &name = TQString() ); virtual ~KPimPrefs(); diff --git a/libkdepim/kpimurlrequesterdlg.cpp b/libkdepim/kpimurlrequesterdlg.cpp index 553ca659f..7815aee55 100644 --- a/libkdepim/kpimurlrequesterdlg.cpp +++ b/libkdepim/kpimurlrequesterdlg.cpp @@ -25,9 +25,9 @@ // KDE3.4 or KDE4.0: FIXME: Move to kdelibs! KURL KPimURLRequesterDlg::getURL( const TQString& dir, const TQString &label, - TQWidget *parent, const TQString& caption ) + TQWidget *tqparent, const TQString& caption ) { - KURLRequesterDlg dlg(dir, label, parent, "filedialog", true); + KURLRequesterDlg dlg(dir, label, tqparent, "filedialog", true); dlg.setCaption(caption.isNull() ? i18n("Open") : caption); diff --git a/libkdepim/kpimurlrequesterdlg.h b/libkdepim/kpimurlrequesterdlg.h index 2d606aa87..ef4cc987f 100644 --- a/libkdepim/kpimurlrequesterdlg.h +++ b/libkdepim/kpimurlrequesterdlg.h @@ -35,12 +35,12 @@ class KDE_EXPORT KPimURLRequesterDlg * * @param url This specifies the initial path of the input line. * @param text The text to be shown on the label. - * @param parent The widget the dialog will be centered on initially. + * @param tqparent The widget the dialog will be centered on initially. */ - static KURL getURL( const TQString &url = TQString::null, - const TQString &text = TQString::null, - TQWidget *parent = 0, - const TQString &caption = TQString::null ); + static KURL getURL( const TQString &url = TQString(), + const TQString &text = TQString(), + TQWidget *tqparent = 0, + const TQString &caption = TQString() ); }; #endif // KPIMURLREQUESTDLG_H_INCLUDED diff --git a/libkdepim/kpixmapregionselectordialog.cpp b/libkdepim/kpixmapregionselectordialog.cpp index 4766a4521..e7645d30b 100644 --- a/libkdepim/kpixmapregionselectordialog.cpp +++ b/libkdepim/kpixmapregionselectordialog.cpp @@ -28,8 +28,8 @@ using namespace KPIM; -KPixmapRegionSelectorDialog::KPixmapRegionSelectorDialog(TQWidget *parent, - const char *name, bool modal ) : KDialogBase(parent, name, modal, i18n("Select Region of Image"), Help|Ok|Cancel, Ok, true ) +KPixmapRegionSelectorDialog::KPixmapRegionSelectorDialog(TQWidget *tqparent, + const char *name, bool modal ) : KDialogBase(tqparent, name, modal, i18n("Select Region of Image"), Help|Ok|Cancel, Ok, true ) { TQVBox *vbox=new TQVBox(this); new TQLabel(i18n("Please click and drag on the image to select the region of interest:"), vbox); @@ -44,9 +44,9 @@ KPixmapRegionSelectorDialog::~KPixmapRegionSelectorDialog() { } -TQRect KPixmapRegionSelectorDialog::getSelectedRegion(const TQPixmap &pixmap, TQWidget *parent ) +TQRect KPixmapRegionSelectorDialog::getSelectedRegion(const TQPixmap &pixmap, TQWidget *tqparent ) { - KPixmapRegionSelectorDialog dialog(parent); + KPixmapRegionSelectorDialog dialog(tqparent); dialog.pixmapRegionSelectorWidget()->setPixmap(pixmap); @@ -65,9 +65,9 @@ TQRect KPixmapRegionSelectorDialog::getSelectedRegion(const TQPixmap &pixmap, TQ return rect; } -TQRect KPixmapRegionSelectorDialog::getSelectedRegion(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *parent ) +TQRect KPixmapRegionSelectorDialog::getSelectedRegion(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *tqparent ) { - KPixmapRegionSelectorDialog dialog(parent); + KPixmapRegionSelectorDialog dialog(tqparent); dialog.pixmapRegionSelectorWidget()->setPixmap(pixmap); dialog.pixmapRegionSelectorWidget()->setSelectionAspectRatio(aspectRatioWidth,aspectRatioHeight); @@ -87,9 +87,9 @@ TQRect KPixmapRegionSelectorDialog::getSelectedRegion(const TQPixmap &pixmap, in return rect; } -TQImage KPixmapRegionSelectorDialog::getSelectedImage(const TQPixmap &pixmap, TQWidget *parent ) +TQImage KPixmapRegionSelectorDialog::getSelectedImage(const TQPixmap &pixmap, TQWidget *tqparent ) { - KPixmapRegionSelectorDialog dialog(parent); + KPixmapRegionSelectorDialog dialog(tqparent); dialog.pixmapRegionSelectorWidget()->setPixmap(pixmap); @@ -107,9 +107,9 @@ TQImage KPixmapRegionSelectorDialog::getSelectedImage(const TQPixmap &pixmap, TQ return image; } -TQImage KPixmapRegionSelectorDialog::getSelectedImage(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *parent ) +TQImage KPixmapRegionSelectorDialog::getSelectedImage(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *tqparent ) { - KPixmapRegionSelectorDialog dialog(parent); + KPixmapRegionSelectorDialog dialog(tqparent); dialog.pixmapRegionSelectorWidget()->setPixmap(pixmap); dialog.pixmapRegionSelectorWidget()->setSelectionAspectRatio(aspectRatioWidth,aspectRatioHeight); diff --git a/libkdepim/kpixmapregionselectordialog.h b/libkdepim/kpixmapregionselectordialog.h index 7cc08e32a..477148fdc 100644 --- a/libkdepim/kpixmapregionselectordialog.h +++ b/libkdepim/kpixmapregionselectordialog.h @@ -51,7 +51,7 @@ public: * later the setPixmap method of the KPixmapRegionSelectorWidget widget of * the new object. */ - KPixmapRegionSelectorDialog(TQWidget *parent=0L, const char *name=0L, + KPixmapRegionSelectorDialog(TQWidget *tqparent=0L, const char *name=0L, bool modal = false ); /** * The destructor of the dialog @@ -72,7 +72,7 @@ public: * @returns the selected rectangle, or an invalid rectangle if the user * pressed the Cancel button. */ - static TQRect getSelectedRegion(const TQPixmap &pixmap, TQWidget *parent = 0L ); + static TQRect getSelectedRegion(const TQPixmap &pixmap, TQWidget *tqparent = 0L ); /** * Creates a modal dialog, lets the user to select a region of the @p pixmap @@ -82,7 +82,7 @@ public: * @returns the selected rectangle, or an invalid rectangle if the user * pressed the Cancel button. */ - static TQRect getSelectedRegion(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *parent = 0L ); + static TQRect getSelectedRegion(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *tqparent = 0L ); /** * Creates a modal dialog, lets the user to select a region of the @p pixmap @@ -91,7 +91,7 @@ public: * @returns the selected image, or an invalid image if the user * pressed the Cancel button. */ - static TQImage getSelectedImage(const TQPixmap &pixmap, TQWidget *parent = 0L ); + static TQImage getSelectedImage(const TQPixmap &pixmap, TQWidget *tqparent = 0L ); /** * Creates a modal dialog, lets the user to select a region of the @p pixmap @@ -101,7 +101,7 @@ public: * @returns the selected image, or an invalid image if the user * pressed the Cancel button. */ - static TQImage getSelectedImage(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *parent = 0L ); + static TQImage getSelectedImage(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *tqparent = 0L ); protected: KPIM::KPixmapRegionSelectorWidget *m_pixmapSelectorWidget; diff --git a/libkdepim/kpixmapregionselectorwidget.cpp b/libkdepim/kpixmapregionselectorwidget.cpp index 308ae0cc7..4efcbbcb0 100644 --- a/libkdepim/kpixmapregionselectorwidget.cpp +++ b/libkdepim/kpixmapregionselectorwidget.cpp @@ -41,8 +41,8 @@ using namespace KPIM; -KPixmapRegionSelectorWidget::KPixmapRegionSelectorWidget( TQWidget *parent, - const char *name) : TQWidget( parent, name) +KPixmapRegionSelectorWidget::KPixmapRegionSelectorWidget( TQWidget *tqparent, + const char *name) : TQWidget( tqparent, name) { TQHBoxLayout * hboxLayout=new TQHBoxLayout( this ); @@ -51,7 +51,7 @@ KPixmapRegionSelectorWidget::KPixmapRegionSelectorWidget( TQWidget *parent, vboxLayout->addStretch(); m_label = new TQLabel(this, "pixmapHolder"); - m_label->setBackgroundMode( Qt::NoBackground ); + m_label->setBackgroundMode( TQt::NoBackground ); m_label->installEventFilter( this ); vboxLayout->addWidget(m_label); @@ -112,9 +112,9 @@ void KPixmapRegionSelectorWidget::updatePixmap() m_linedPixmap = m_originalPixmap; painter.begin(&m_linedPixmap); - painter.setRasterOp( Qt::XorROP ); + painter.setRasterOp( TQt::XorROP ); painter.fillRect(0,0,m_linedPixmap.width(), m_linedPixmap.height(), - TQBrush( TQColor(255,255,255), Qt::BDiagPattern) ); + TQBrush( TQColor(255,255,255), TQt::BDiagPattern) ); painter.end(); TQImage image=m_linedPixmap.convertToImage(); @@ -129,7 +129,7 @@ void KPixmapRegionSelectorWidget::updatePixmap() m_originalPixmap, m_selectedRegion ); painter.setPen( TQColor(255,255,255) ); - painter.setRasterOp( Qt::XorROP ); + painter.setRasterOp( TQt::XorROP ); painter.drawRect( m_selectedRegion ); @@ -231,12 +231,12 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev) && m_selectedRegion!=m_originalPixmap.rect() ) { m_state=Moving; - cursor=TQCursor(Qt::SizeAllCursor); + cursor=TQCursor(TQt::SizeAllCursor); } else { m_state=Resizing; - cursor=TQCursor(Qt::CrossCursor); + cursor=TQCursor(TQt::CrossCursor); } TQApplication::setOverrideCursor(cursor); diff --git a/libkdepim/kpixmapregionselectorwidget.h b/libkdepim/kpixmapregionselectorwidget.h index 4d92869da..b1ad7bbd2 100644 --- a/libkdepim/kpixmapregionselectorwidget.h +++ b/libkdepim/kpixmapregionselectorwidget.h @@ -44,15 +44,16 @@ namespace KPIM { * @author Antonio Larrosa <larrosa@kde.org> * @since 3.4 */ -class KPixmapRegionSelectorWidget : public QWidget +class KPixmapRegionSelectorWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** * Constructor for a KPixmapRegionSelectorWidget. */ - KPixmapRegionSelectorWidget( TQWidget *parent = 0L, const char *name=0L); + KPixmapRegionSelectorWidget( TQWidget *tqparent = 0L, const char *name=0L); /** * Destructor for a KPixmapRegionSelectorWidget diff --git a/libkdepim/kprefsdialog.cpp b/libkdepim/kprefsdialog.cpp index 93b3feaae..547c712c5 100644 --- a/libkdepim/kprefsdialog.cpp +++ b/libkdepim/kprefsdialog.cpp @@ -50,18 +50,18 @@ namespace KPrefsWidFactory { -KPrefsWid *create( KConfigSkeletonItem *item, TQWidget *parent ) +KPrefsWid *create( KConfigSkeletonItem *item, TQWidget *tqparent ) { KConfigSkeleton::ItemBool *boolItem = dynamic_cast<KConfigSkeleton::ItemBool *>( item ); if ( boolItem ) { - return new KPrefsWidBool( boolItem, parent ); + return new KPrefsWidBool( boolItem, tqparent ); } KConfigSkeleton::ItemString *stringItem = dynamic_cast<KConfigSkeleton::ItemString *>( item ); if ( stringItem ) { - return new KPrefsWidString( stringItem, parent ); + return new KPrefsWidString( stringItem, tqparent ); } KConfigSkeleton::ItemEnum *enumItem = @@ -72,7 +72,7 @@ KPrefsWid *create( KConfigSkeletonItem *item, TQWidget *parent ) kdError() << "KPrefsWidFactory::create(): Enum has no choices." << endl; return 0; } else { - KPrefsWidRadios *radios = new KPrefsWidRadios( enumItem, parent ); + KPrefsWidRadios *radios = new KPrefsWidRadios( enumItem, tqparent ); TQValueList<KConfigSkeleton::ItemEnum::Choice>::ConstIterator it; for( it = choices.begin(); it != choices.end(); ++it ) { radios->addRadio( (*it).label ); @@ -84,7 +84,7 @@ KPrefsWid *create( KConfigSkeletonItem *item, TQWidget *parent ) KConfigSkeleton::ItemInt *intItem = dynamic_cast<KConfigSkeleton::ItemInt *>( item ); if ( intItem ) { - return new KPrefsWidInt( intItem, parent ); + return new KPrefsWidInt( intItem, tqparent ); } return 0; @@ -99,10 +99,10 @@ TQValueList<TQWidget *> KPrefsWid::widgets() const } -KPrefsWidBool::KPrefsWidBool( KConfigSkeleton::ItemBool *item, TQWidget *parent ) +KPrefsWidBool::KPrefsWidBool( KConfigSkeleton::ItemBool *item, TQWidget *tqparent ) : mItem( item ) { - mCheck = new TQCheckBox( item->label(), parent); + mCheck = new TQCheckBox( item->label(), tqparent); connect( mCheck, TQT_SIGNAL( clicked() ), TQT_SIGNAL( changed() ) ); if ( !item->whatsThis().isNull() ) { TQWhatsThis::add( mCheck, item->whatsThis() ); @@ -133,11 +133,11 @@ TQValueList<TQWidget *> KPrefsWidBool::widgets() const KPrefsWidInt::KPrefsWidInt( KConfigSkeleton::ItemInt *item, - TQWidget *parent ) + TQWidget *tqparent ) : mItem( item ) { - mLabel = new TQLabel( mItem->label()+':', parent ); - mSpin = new TQSpinBox( parent ); + mLabel = new TQLabel( mItem->label()+':', tqparent ); + mSpin = new TQSpinBox( tqparent ); if ( !item->minValue().isNull() ) { mSpin->setMinValue( item->minValue().toInt() ); } @@ -183,12 +183,12 @@ TQValueList<TQWidget *> KPrefsWidInt::widgets() const KPrefsWidColor::KPrefsWidColor( KConfigSkeleton::ItemColor *item, - TQWidget *parent ) + TQWidget *tqparent ) : mItem( item ) { - mButton = new KColorButton( parent ); + mButton = new KColorButton( tqparent ); connect( mButton, TQT_SIGNAL( changed( const TQColor & ) ), TQT_SIGNAL( changed() ) ); - mLabel = new TQLabel( mButton, mItem->label()+':', parent ); + mLabel = new TQLabel( mButton, mItem->label()+':', tqparent ); mLabel->setBuddy( mButton ); TQString whatsThis = mItem->whatsThis(); if (!whatsThis.isNull()) { @@ -223,15 +223,15 @@ KColorButton *KPrefsWidColor::button() KPrefsWidFont::KPrefsWidFont( KConfigSkeleton::ItemFont *item, - TQWidget *parent, const TQString &sampleText ) + TQWidget *tqparent, const TQString &sampleText ) : mItem( item ) { - mLabel = new TQLabel( mItem->label()+':', parent ); + mLabel = new TQLabel( mItem->label()+':', tqparent ); - mPreview = new TQLabel( sampleText, parent ); + mPreview = new TQLabel( sampleText, tqparent ); mPreview->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); - mButton = new TQPushButton( i18n("Choose..."), parent ); + mButton = new TQPushButton( i18n("Choose..."), tqparent ); connect( mButton, TQT_SIGNAL( clicked() ), TQT_SLOT( selectFont() ) ); TQString whatsThis = mItem->whatsThis(); if (!whatsThis.isNull()) { @@ -281,11 +281,11 @@ void KPrefsWidFont::selectFont() KPrefsWidTime::KPrefsWidTime( KConfigSkeleton::ItemDateTime *item, - TQWidget *parent ) + TQWidget *tqparent ) : mItem( item ) { - mLabel = new TQLabel( mItem->label()+':', parent ); - mTimeEdit = new KTimeEdit( parent ); + mLabel = new TQLabel( mItem->label()+':', tqparent ); + mTimeEdit = new KTimeEdit( tqparent ); mLabel->setBuddy( mTimeEdit ); connect( mTimeEdit, TQT_SIGNAL( timeChanged( TQTime ) ), TQT_SIGNAL( changed() ) ); TQString whatsThis = mItem->whatsThis(); @@ -320,14 +320,14 @@ KTimeEdit *KPrefsWidTime::timeEdit() KPrefsWidDuration::KPrefsWidDuration( KConfigSkeleton::ItemDateTime *item, - TQWidget *parent ) + TQWidget *tqparent ) : mItem( item ) { - mLabel = new TQLabel( mItem->label()+':', parent ); - mTimeEdit = new QTimeEdit( parent ); + mLabel = new TQLabel( mItem->label()+':', tqparent ); + mTimeEdit = new TQTimeEdit( tqparent ); mLabel->setBuddy( mTimeEdit ); mTimeEdit->setAutoAdvance( true ); - mTimeEdit->setDisplay( QTimeEdit::Hours | QTimeEdit::Minutes ); + mTimeEdit->setDisplay( TQTimeEdit::Hours | TQTimeEdit::Minutes ); mTimeEdit->setRange( TQTime( 0, 1 ), TQTime( 24, 0 ) ); // [1min, 24hr] connect( mTimeEdit, TQT_SIGNAL( valueChanged( const TQTime & ) ), TQT_SIGNAL( changed() ) ); @@ -354,18 +354,18 @@ TQLabel *KPrefsWidDuration::label() return mLabel; } -QTimeEdit *KPrefsWidDuration::timeEdit() +TQTimeEdit *KPrefsWidDuration::timeEdit() { return mTimeEdit; } KPrefsWidDate::KPrefsWidDate( KConfigSkeleton::ItemDateTime *item, - TQWidget *parent ) + TQWidget *tqparent ) : mItem( item ) { - mLabel = new TQLabel( mItem->label()+':', parent ); - mDateEdit = new KDateEdit( parent ); + mLabel = new TQLabel( mItem->label()+':', tqparent ); + mDateEdit = new KDateEdit( tqparent ); mLabel->setBuddy( mDateEdit ); connect( mDateEdit, TQT_SIGNAL( dateChanged( const TQDate& ) ), TQT_SIGNAL( changed() ) ); TQString whatsThis = mItem->whatsThis(); @@ -398,10 +398,10 @@ KDateEdit *KPrefsWidDate::dateEdit() KPrefsWidRadios::KPrefsWidRadios( KConfigSkeleton::ItemEnum *item, - TQWidget *parent ) + TQWidget *tqparent ) : mItem( item ) { - mBox = new TQButtonGroup( 1, Qt::Horizontal, mItem->label(), parent ); + mBox = new TQButtonGroup( 1, TQt::Horizontal, mItem->label(), tqparent ); connect( mBox, TQT_SIGNAL( clicked( int ) ), TQT_SIGNAL( changed() ) ); } @@ -440,10 +440,10 @@ TQValueList<TQWidget *> KPrefsWidRadios::widgets() const } KPrefsWidCombo::KPrefsWidCombo( KConfigSkeleton::ItemEnum *item, - TQWidget *parent ) + TQWidget *tqparent ) : mItem( item ) { - TQHBox *hbox = new TQHBox(parent); + TQHBox *hbox = new TQHBox(tqparent); new TQLabel( mItem->label(), hbox ); mCombo = new TQComboBox( hbox ); connect( mCombo, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( changed() ) ); @@ -476,12 +476,12 @@ TQComboBox* KPrefsWidCombo::comboBox() } KPrefsWidString::KPrefsWidString( KConfigSkeleton::ItemString *item, - TQWidget *parent, + TQWidget *tqparent, TQLineEdit::EchoMode echomode ) : mItem( item ) { - mLabel = new TQLabel( mItem->label()+':', parent ); - mEdit = new TQLineEdit( parent ); + mLabel = new TQLabel( mItem->label()+':', tqparent ); + mEdit = new TQLineEdit( tqparent ); mLabel->setBuddy( mEdit ); connect( mEdit, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SIGNAL( changed() ) ); @@ -525,12 +525,12 @@ TQValueList<TQWidget *> KPrefsWidString::widgets() const } -KPrefsWidPath::KPrefsWidPath( KConfigSkeleton::ItemPath *item, TQWidget *parent, +KPrefsWidPath::KPrefsWidPath( KConfigSkeleton::ItemPath *item, TQWidget *tqparent, const TQString &filter, uint mode ) : mItem( item ) { - mLabel = new TQLabel( mItem->label()+':', parent ); - mURLRequester = new KURLRequester( parent ); + mLabel = new TQLabel( mItem->label()+':', tqparent ); + mURLRequester = new KURLRequester( tqparent ); mLabel->setBuddy( mURLRequester ); mURLRequester->setMode( mode ); mURLRequester->setFilter( filter ); @@ -590,49 +590,49 @@ void KPrefsWidManager::addWid( KPrefsWid *wid ) } KPrefsWidBool *KPrefsWidManager::addWidBool( KConfigSkeleton::ItemBool *item, - TQWidget *parent ) + TQWidget *tqparent ) { - KPrefsWidBool *w = new KPrefsWidBool( item, parent ); + KPrefsWidBool *w = new KPrefsWidBool( item, tqparent ); addWid( w ); return w; } KPrefsWidTime *KPrefsWidManager::addWidTime( KConfigSkeleton::ItemDateTime *item, - TQWidget *parent ) + TQWidget *tqparent ) { - KPrefsWidTime *w = new KPrefsWidTime( item, parent ); + KPrefsWidTime *w = new KPrefsWidTime( item, tqparent ); addWid( w ); return w; } KPrefsWidDuration *KPrefsWidManager::addWidDuration( KConfigSkeleton::ItemDateTime *item, - TQWidget *parent ) + TQWidget *tqparent ) { - KPrefsWidDuration *w = new KPrefsWidDuration( item, parent ); + KPrefsWidDuration *w = new KPrefsWidDuration( item, tqparent ); addWid( w ); return w; } KPrefsWidDate *KPrefsWidManager::addWidDate( KConfigSkeleton::ItemDateTime *item, - TQWidget *parent ) + TQWidget *tqparent ) { - KPrefsWidDate *w = new KPrefsWidDate( item, parent ); + KPrefsWidDate *w = new KPrefsWidDate( item, tqparent ); addWid( w ); return w; } KPrefsWidColor *KPrefsWidManager::addWidColor( KConfigSkeleton::ItemColor *item, - TQWidget *parent ) + TQWidget *tqparent ) { - KPrefsWidColor *w = new KPrefsWidColor( item, parent ); + KPrefsWidColor *w = new KPrefsWidColor( item, tqparent ); addWid( w ); return w; } KPrefsWidRadios *KPrefsWidManager::addWidRadios( KConfigSkeleton::ItemEnum *item, - TQWidget *parent ) + TQWidget *tqparent ) { - KPrefsWidRadios *w = new KPrefsWidRadios( item, parent ); + KPrefsWidRadios *w = new KPrefsWidRadios( item, tqparent ); TQValueList<KConfigSkeleton::ItemEnum::Choice> choices; choices = item->choices(); TQValueList<KConfigSkeleton::ItemEnum::Choice>::ConstIterator it; @@ -644,9 +644,9 @@ KPrefsWidRadios *KPrefsWidManager::addWidRadios( KConfigSkeleton::ItemEnum *item } KPrefsWidCombo *KPrefsWidManager::addWidCombo( KConfigSkeleton::ItemEnum *item, - TQWidget* parent ) + TQWidget* tqparent ) { - KPrefsWidCombo *w = new KPrefsWidCombo( item, parent ); + KPrefsWidCombo *w = new KPrefsWidCombo( item, tqparent ); TQValueList<KConfigSkeleton::ItemEnum::Choice> choices; choices = item->choices(); TQValueList<KConfigSkeleton::ItemEnum::Choice>::ConstIterator it; @@ -658,43 +658,43 @@ KPrefsWidCombo *KPrefsWidManager::addWidCombo( KConfigSkeleton::ItemEnum *item, } KPrefsWidString *KPrefsWidManager::addWidString( KConfigSkeleton::ItemString *item, - TQWidget *parent ) + TQWidget *tqparent ) { - KPrefsWidString *w = new KPrefsWidString( item, parent, + KPrefsWidString *w = new KPrefsWidString( item, tqparent, TQLineEdit::Normal ); addWid( w ); return w; } KPrefsWidPath *KPrefsWidManager::addWidPath( KConfigSkeleton::ItemPath *item, - TQWidget *parent, const TQString &filter, uint mode ) + TQWidget *tqparent, const TQString &filter, uint mode ) { - KPrefsWidPath *w = new KPrefsWidPath( item, parent, filter, mode ); + KPrefsWidPath *w = new KPrefsWidPath( item, tqparent, filter, mode ); addWid( w ); return w; } KPrefsWidString *KPrefsWidManager::addWidPassword( KConfigSkeleton::ItemString *item, - TQWidget *parent ) + TQWidget *tqparent ) { - KPrefsWidString *w = new KPrefsWidString( item, parent, TQLineEdit::Password ); + KPrefsWidString *w = new KPrefsWidString( item, tqparent, TQLineEdit::Password ); addWid( w ); return w; } KPrefsWidFont *KPrefsWidManager::addWidFont( KConfigSkeleton::ItemFont *item, - TQWidget *parent, + TQWidget *tqparent, const TQString &sampleText ) { - KPrefsWidFont *w = new KPrefsWidFont( item, parent, sampleText ); + KPrefsWidFont *w = new KPrefsWidFont( item, tqparent, sampleText ); addWid( w ); return w; } KPrefsWidInt *KPrefsWidManager::addWidInt( KConfigSkeleton::ItemInt *item, - TQWidget *parent ) + TQWidget *tqparent ) { - KPrefsWidInt *w = new KPrefsWidInt( item, parent ); + KPrefsWidInt *w = new KPrefsWidInt( item, tqparent ); addWid( w ); return w; } @@ -733,9 +733,9 @@ void KPrefsWidManager::writeWidConfig() } -KPrefsDialog::KPrefsDialog( KConfigSkeleton *prefs, TQWidget *parent, char *name, +KPrefsDialog::KPrefsDialog( KConfigSkeleton *prefs, TQWidget *tqparent, char *name, bool modal ) - : KDialogBase(IconList,i18n("Preferences"),Ok|Apply|Cancel|Default,Ok,parent, + : KDialogBase(IconList,i18n("Preferences"),Ok|Apply|Cancel|Default,Ok,tqparent, name,modal,true), KPrefsWidManager( prefs ) { @@ -857,9 +857,9 @@ void KPrefsDialog::slotDefault() } -KPrefsModule::KPrefsModule( KConfigSkeleton *prefs, TQWidget *parent, +KPrefsModule::KPrefsModule( KConfigSkeleton *prefs, TQWidget *tqparent, const char *name ) - : KCModule( parent, name ), + : KCModule( tqparent, name ), KPrefsWidManager( prefs ) { emit changed( false ); diff --git a/libkdepim/kprefsdialog.h b/libkdepim/kprefsdialog.h index 3667a7ae9..e94b4a44a 100644 --- a/libkdepim/kprefsdialog.h +++ b/libkdepim/kprefsdialog.h @@ -41,7 +41,7 @@ class TQComboBox; class TQLabel; class TQSpinBox; class TQButtonGroup; -class QTimeEdit; +class TQTimeEdit; class KTimeEdit; class KDateEdit; class KURLRequester; @@ -55,9 +55,10 @@ class KURLRequester; KPrefsDialog. The control element consists of a set of widgets for handling a certain type of configuration information. */ -class KDE_EXPORT KPrefsWid : public QObject +class KDE_EXPORT KPrefsWid : public TQObject { Q_OBJECT + TQ_OBJECT public: /** This function is called to read value of the setting from the @@ -92,15 +93,15 @@ class KDE_EXPORT KPrefsWidBool : public KPrefsWid { public: /** - Create a bool value control element consisting of a QCheckbox. + Create a bool value control element consisting of a TQCheckbox. @param item The KConfigSkeletonItem representing the preferences entry. - @param parent Parent widget. + @param tqparent Parent widget. */ - KPrefsWidBool( KConfigSkeleton::ItemBool *item, TQWidget *parent ); + KPrefsWidBool( KConfigSkeleton::ItemBool *item, TQWidget *tqparent ); /** - Return the QCheckbox used by this control element. + Return the TQCheckbox used by this control element. */ TQCheckBox *checkBox(); @@ -130,9 +131,9 @@ class KDE_EXPORT KPrefsWidInt : public KPrefsWid spinbox. @param item The KConfigSkeletonItem representing the preferences entry. - @param parent Parent widget. + @param tqparent Parent widget. */ - KPrefsWidInt( KConfigSkeleton::ItemInt *item, TQWidget *parent ); + KPrefsWidInt( KConfigSkeleton::ItemInt *item, TQWidget *tqparent ); /** Return TQLabel used by this control element. @@ -170,9 +171,9 @@ class KDE_EXPORT KPrefsWidTime : public KPrefsWid Create a time value control element consisting of a label and a spinbox. @param item The KConfigSkeletonItem representing the preferences entry. - @param parent Parent widget. + @param tqparent Parent widget. */ - KPrefsWidTime( KConfigSkeleton::ItemDateTime *item, TQWidget *parent ); + KPrefsWidTime( KConfigSkeleton::ItemDateTime *item, TQWidget *tqparent ); /** Return TQLabel used by this widget. @@ -208,9 +209,9 @@ class KDE_EXPORT KPrefsWidDuration : public KPrefsWid spinbox. @param item The KConfigSkeletonItem representing the preferences entry. - @param parent Parent widget. + @param tqparent Parent widget. */ - KPrefsWidDuration( KConfigSkeleton::ItemDateTime *item, TQWidget *parent ); + KPrefsWidDuration( KConfigSkeleton::ItemDateTime *item, TQWidget *tqparent ); /** Return TQLabel used by this widget. @@ -219,7 +220,7 @@ class KDE_EXPORT KPrefsWidDuration : public KPrefsWid /** Return TQSpinBox used by this widget. */ - QTimeEdit *timeEdit(); + TQTimeEdit *timeEdit(); void readConfig(); void writeConfig(); @@ -228,7 +229,7 @@ class KDE_EXPORT KPrefsWidDuration : public KPrefsWid KConfigSkeleton::ItemDateTime *mItem; TQLabel *mLabel; - QTimeEdit *mTimeEdit; + TQTimeEdit *mTimeEdit; }; /** @@ -245,9 +246,9 @@ class KDE_EXPORT KPrefsWidDate : public KPrefsWid Create a time value control element consisting of a label and a date box. @param item The KConfigSkeletonItem representing the preferences entry. - @param parent Parent widget. + @param tqparent Parent widget. */ - KPrefsWidDate( KConfigSkeleton::ItemDateTime *item, TQWidget *parent ); + KPrefsWidDate( KConfigSkeleton::ItemDateTime *item, TQWidget *tqparent ); /** Return TQLabel used by this widget. @@ -278,15 +279,16 @@ class KDE_EXPORT KPrefsWidDate : public KPrefsWid class KDE_EXPORT KPrefsWidColor : public KPrefsWid { Q_OBJECT + TQ_OBJECT public: /** Create a color value control element consisting of a test field and a button for opening a color dialog. @param item The KConfigSkeletonItem representing the preferences entry. - @param parent Parent widget. + @param tqparent Parent widget. */ - KPrefsWidColor( KConfigSkeleton::ItemColor *item, TQWidget *parent ); + KPrefsWidColor( KConfigSkeleton::ItemColor *item, TQWidget *tqparent ); /** Destruct color setting widget. */ @@ -320,17 +322,18 @@ class KDE_EXPORT KPrefsWidColor : public KPrefsWid class KDE_EXPORT KPrefsWidFont : public KPrefsWid { Q_OBJECT + TQ_OBJECT public: /** Create a font value control element consisting of a test field and a button for opening a font dialog. @param item The KConfigSkeletonItem representing the preferences entry. - @param parent Parent widget. + @param tqparent Parent widget. @param sampleText Sample text for previewing the selected font. */ KPrefsWidFont( KConfigSkeleton::ItemFont *item, - TQWidget *parent, const TQString &sampleText ); + TQWidget *tqparent, const TQString &sampleText ); /** Destruct font setting widget. */ @@ -382,9 +385,9 @@ class KDE_EXPORT KPrefsWidRadios : public KPrefsWid with several radio buttons. @param item The KConfigSkeletonItem representing the preferences entry. - @param parent Parent widget. + @param tqparent Parent widget. */ - KPrefsWidRadios( KConfigSkeleton::ItemEnum *item, TQWidget *parent ); + KPrefsWidRadios( KConfigSkeleton::ItemEnum *item, TQWidget *tqparent ); virtual ~KPrefsWidRadios(); /** @@ -394,7 +397,7 @@ class KDE_EXPORT KPrefsWidRadios : public KPrefsWid @param whatsThis What's This help for the button. */ void addRadio( const TQString &text, - const TQString &whatsThis = TQString::null ); + const TQString &whatsThis = TQString() ); /** Return the box widget used by this widget. @@ -430,9 +433,9 @@ class KDE_EXPORT KPrefsWidCombo : public KPrefsWid combo box. @param item The KConfigSkeletonItem representing the preferences entry. - @param parent Parent widget. + @param tqparent Parent widget. */ - KPrefsWidCombo( KConfigSkeleton::ItemEnum *item, TQWidget *parent ); + KPrefsWidCombo( KConfigSkeleton::ItemEnum *item, TQWidget *tqparent ); virtual ~KPrefsWidCombo(); void readConfig(); @@ -463,10 +466,10 @@ class KDE_EXPORT KPrefsWidString : public KPrefsWid line edit. @param item The KConfigSkeletonItem representing the preferences entry. - @param parent Parent widget. + @param tqparent Parent widget. @param echomode Describes how a line edit should display its contents. */ - KPrefsWidString( KConfigSkeleton::ItemString *item, TQWidget *parent, + KPrefsWidString( KConfigSkeleton::ItemString *item, TQWidget *tqparent, TQLineEdit::EchoMode echomode=TQLineEdit::Normal ); /** Destructor. @@ -510,12 +513,12 @@ class KDE_EXPORT KPrefsWidPath : public KPrefsWid line edit. @param item The KConfigSkeletonItem representing the preferences entry. - @param parent Parent widget. + @param tqparent Parent widget. @param filter URLRequester filter @param mode Describes how a line edit should display its contents. */ - KPrefsWidPath( KConfigSkeleton::ItemPath *item, TQWidget *parent, - const TQString &filter = TQString::null, uint mode = KFile::File ); + KPrefsWidPath( KConfigSkeleton::ItemPath *item, TQWidget *tqparent, + const TQString &filter = TQString(), uint mode = KFile::File ); /** Destructor. */ @@ -576,116 +579,116 @@ class KDE_EXPORT KPrefsWidManager Register a @ref KPrefsWidBool object. @param item The KConfigSkeletonItem representing the preferences entry. - @param parent Parent widget. + @param tqparent Parent widget. */ KPrefsWidBool *addWidBool( KConfigSkeleton::ItemBool *item, - TQWidget *parent ); + TQWidget *tqparent ); /** Register a @ref KPrefsWidInt object. @param item The KConfigSkeletonItem representing the preferences entry. - @param parent Parent widget. + @param tqparent Parent widget. */ KPrefsWidInt *addWidInt( KConfigSkeleton::ItemInt *item, - TQWidget *parent ); + TQWidget *tqparent ); /** Register a @ref KPrefsWidDate object. @param item The KConfigSkeletonItem representing the preferences entry. - @param parent Parent widget. + @param tqparent Parent widget. */ KPrefsWidDate *addWidDate( KConfigSkeleton::ItemDateTime *item, - TQWidget *parent ); + TQWidget *tqparent ); /** Register a @ref KPrefsWidTime object. @param item The KConfigSkeletonItem representing the preferences entry. - @param parent Parent widget. + @param tqparent Parent widget. */ KPrefsWidTime *addWidTime( KConfigSkeleton::ItemDateTime *item, - TQWidget *parent ); + TQWidget *tqparent ); /** Register a @ref KPrefsWidDuration object. @param item The KConfigSkeletonItem representing the preferences entry. - @param parent Parent widget. + @param tqparent Parent widget. */ KPrefsWidDuration *addWidDuration( KConfigSkeleton::ItemDateTime *item, - TQWidget *parent ); + TQWidget *tqparent ); /** Register a @ref KPrefsWidColor object. @param item The KConfigSkeletonItem representing the preferences entry. - @param parent Parent widget. + @param tqparent Parent widget. */ KPrefsWidColor *addWidColor( KConfigSkeleton::ItemColor *item, - TQWidget *parent ); + TQWidget *tqparent ); /** Register a @ref KPrefsWidRadios object. The choices represented by the given item object are automatically added as radio buttons. @param item The KConfigSkeletonItem representing the preferences entry. - @param parent Parent widget. + @param tqparent Parent widget. */ KPrefsWidRadios *addWidRadios( KConfigSkeleton::ItemEnum *item, - TQWidget *parent ); + TQWidget *tqparent ); /** Register a @ref KPrefsWidCombo object. The choices represented by the given item object are automatically added to the combo box. @param item The KConfigSkeletonItem representing the preferences entry. - @param parent Parent widget. + @param tqparent Parent widget. */ KPrefsWidCombo *addWidCombo( KConfigSkeleton::ItemEnum *item, - TQWidget *parent ); + TQWidget *tqparent ); /** Register a @ref KPrefsWidString object. @param item The KConfigSkeletonItem representing the preferences entry. - @param parent Parent widget. + @param tqparent Parent widget. */ KPrefsWidString *addWidString( KConfigSkeleton::ItemString *item, - TQWidget *parent ); + TQWidget *tqparent ); /** Register a path @ref KPrefsWidPath object. @param item The KConfigSkeletonItem representing the preferences entry. - @param parent Parent widget. + @param tqparent Parent widget. @param filter URLRequester filter @param mode URLRequester mode */ - KPrefsWidPath *addWidPath ( KConfigSkeleton::ItemPath *item, TQWidget *parent, - const TQString &filter = TQString::null, + KPrefsWidPath *addWidPath ( KConfigSkeleton::ItemPath *item, TQWidget *tqparent, + const TQString &filter = TQString(), uint mode = KFile::File ); /** Register a password @ref KPrefsWidString object, with echomode set to TQLineEdit::Password. @param item The KConfigSkeletonItem representing the preferences entry. - @param parent Parent widget. + @param tqparent Parent widget. */ KPrefsWidString *addWidPassword ( KConfigSkeleton::ItemString *item, - TQWidget *parent ); + TQWidget *tqparent ); /** Register a @ref KPrefsWidFont object. @param item The KConfigSkeletonItem representing the preferences entry. - @param parent Parent widget. + @param tqparent Parent widget. @param sampleText Sample text for previewing the selected font. */ KPrefsWidFont *addWidFont( KConfigSkeleton::ItemFont *item, - TQWidget *parent, const TQString &sampleText ); + TQWidget *tqparent, const TQString &sampleText ); /** Set all widgets to default values. */ void setWidDefaults(); @@ -718,16 +721,17 @@ class KDE_EXPORT KPrefsWidManager class KDE_EXPORT KPrefsDialog : public KDialogBase, public KPrefsWidManager { Q_OBJECT + TQ_OBJECT public: /** Create a KPrefsDialog for a KPrefs object. @param prefs KPrefs object used to access te configuration. - @param parent Parent widget. + @param tqparent Parent widget. @param name Widget name. @param modal true, if dialog has to be modal, false for non-modal. */ - KPrefsDialog( KConfigSkeleton *prefs, TQWidget *parent = 0, char *name = 0, + KPrefsDialog( KConfigSkeleton *prefs, TQWidget *tqparent = 0, char *name = 0, bool modal = false ); /** Destructor. @@ -771,8 +775,9 @@ class KDE_EXPORT KPrefsDialog : public KDialogBase, public KPrefsWidManager class KDE_EXPORT KPrefsModule : public KCModule, public KPrefsWidManager { Q_OBJECT + TQ_OBJECT public: - KPrefsModule( KConfigSkeleton *, TQWidget *parent = 0, const char *name = 0 ); + KPrefsModule( KConfigSkeleton *, TQWidget *tqparent = 0, const char *name = 0 ); virtual void addWid( KPrefsWid * ); diff --git a/libkdepim/kregexp3.cpp b/libkdepim/kregexp3.cpp index f34dad339..87827e079 100644 --- a/libkdepim/kregexp3.cpp +++ b/libkdepim/kregexp3.cpp @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this library with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -38,12 +38,12 @@ #endif TQString KRegExp3::tqreplace( const TQString & str, - const TQString & tqreplacementStr, + const TQString & replacementStr, int start, bool global ) { int oldpos, pos; - //-------- parsing the tqreplacementStr into + //-------- parsing the replacementStr into //-------- literal parts and backreferences: TQStringList literalStrs; TQValueList<int> backRefs; @@ -55,20 +55,20 @@ TQString KRegExp3::tqreplace( const TQString & str, TQRegExp brx("\\"); #ifdef DEBUG_KREGEXP3 - kdDebug() << "Analyzing tqreplacementStr: \"" + tqreplacementStr + "\"" << endl; + kdDebug() << "Analyzing replacementStr: \"" + replacementStr + "\"" << endl; #endif oldpos = 0; pos = 0; while ( true ) { - pos = rx.search( tqreplacementStr, pos ); + pos = rx.search( replacementStr, pos ); #ifdef DEBUG_KREGEXP3 kdDebug() << TQString(" Found match at pos %1").arg(pos) << endl; #endif if ( pos < 0 ) { - literalStrs << tqreplacementStr.mid( oldpos ) + literalStrs << replacementStr.mid( oldpos ) .tqreplace( bbrx, "\\" ) .tqreplace( brx, "" ); #ifdef DEBUG_KREGEXP3 @@ -76,7 +76,7 @@ TQString KRegExp3::tqreplace( const TQString & str, #endif break; } else { - literalStrs << tqreplacementStr.mid( oldpos, pos-oldpos ) + literalStrs << replacementStr.mid( oldpos, pos-oldpos ) .tqreplace( bbrx, "\\" ) .tqreplace( brx, "" ); #ifdef DEBUG_KREGEXP3 @@ -101,12 +101,12 @@ TQString KRegExp3::tqreplace( const TQString & str, } #ifdef DEBUG_KREGEXP3 - kdDebug() << "Finished the analysis of tqreplacementStr!" << endl; + kdDebug() << "Finished the analysis of replacementStr!" << endl; #endif Q_ASSERT( literalStrs.count() == backRefs.count() + 1 ); //-------- actual construction of the - //-------- resulting QString + //-------- resulting TQString TQString result = ""; oldpos = 0; pos = start; @@ -145,7 +145,7 @@ TQString KRegExp3::tqreplace( const TQString & str, iIt != backRefs.end() ; ++sIt, ++iIt ) { result += (*sIt); #ifdef DEBUG_KREGEXP3 - kdDebug() << " Adding literal tqreplacement part:" << endl; + kdDebug() << " Adding literal replacement part:" << endl; kdDebug() << " result == \"" + result + "\"" << endl; #endif result += cap( (*iIt) ); @@ -156,7 +156,7 @@ TQString KRegExp3::tqreplace( const TQString & str, } result += (*sIt); #ifdef DEBUG_KREGEXP3 - kdDebug() << " Adding literal tqreplacement part:" << endl; + kdDebug() << " Adding literal replacement part:" << endl; kdDebug() << " result == \"" + result + "\"" << endl; #endif } @@ -173,7 +173,7 @@ TQString KRegExp3::tqreplace( const TQString & str, oldpos = pos; if ( !global ) { - // only tqreplace the first occurrence, so stop here: + // only replace the first occurrence, so stop here: result += str.mid( oldpos ); break; } diff --git a/libkdepim/kregexp3.h b/libkdepim/kregexp3.h index c9b53c5f1..64a874d3a 100644 --- a/libkdepim/kregexp3.h +++ b/libkdepim/kregexp3.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this library with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -36,21 +36,21 @@ #include <kdepimmacros.h> -/** @short A TQRegExp (Qt3.x) with a tqreplace() method. +/** @short A TQRegExp (TQt3.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 + enhancements of the mighty TQRegExp (TQt3 version) regular expression engine, namely the method tqreplace(), which can be - used to do search-and-tqreplace like one is used to from perl or sed. + used to do search-and-replace like one is used to from perl or sed. - It "simply" adds the ability to define a tqreplacement string which - tqcontains references to the captured substrings. The following + It "simply" adds the ability to define a replacement string which + contains references to the captured substrings. The following constructs are understood, which can be freely mixed in the - tqreplacement string: + replacement string: @section Sed syntax - Back references in the tqreplacement string are made using \n + Back references in the replacement 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 tqreplacement string are made using $n + Back references in the replacement 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. @@ -73,10 +73,10 @@ To reference the entire matched string, use $0, ${0} or \\0. @author Marc Mutz <mutz@kde.org> - @see QRegExp + @see TQRegExp */ -class KDE_EXPORT KRegExp3 : public QRegExp +class KDE_EXPORT KRegExp3 : public TQRegExp { public: KRegExp3() @@ -91,21 +91,21 @@ public: : TQRegExp( (TQRegExp)rx ) {} /** Replaces each matching subpattern in @p str with - @p tqreplacementStr, inserting captured substrings for + @p replacementStr, inserting captured substrings for \\n, $n and ${nn} as described in the class documentation. @param str The source string. - @param tqreplacementStr The string which tqreplaces matched + @param replacementStr The string which replaces 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 tqreplace all occurrences - of the regexp with @p tqreplacementStr; if @p FALSE, - only the first occurrence will be tqreplaced. + @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. Equivalent to the /g switch to perl's s/// operator. @return The modified string. */ TQString tqreplace( const TQString & str, - const TQString & tqreplacementStr, + const TQString & replacementStr, int start=0, bool global=TRUE ); }; diff --git a/libkdepim/kresourceprefs.h b/libkdepim/kresourceprefs.h index e36dc608c..2cc2ae832 100644 --- a/libkdepim/kresourceprefs.h +++ b/libkdepim/kresourceprefs.h @@ -38,7 +38,7 @@ class TQString; class KDE_EXPORT KResourcePrefs : public KConfigSkeleton { public: - KResourcePrefs( const TQString &name = TQString::null ); + KResourcePrefs( const TQString &name = TQString() ); /** Adds a prefix to all groups of this prefs object. diff --git a/libkdepim/krsqueezedtextlabel.cpp b/libkdepim/krsqueezedtextlabel.cpp index ef9746ee0..512db73cf 100644 --- a/libkdepim/krsqueezedtextlabel.cpp +++ b/libkdepim/krsqueezedtextlabel.cpp @@ -22,15 +22,15 @@ #include "kstringhandler.h" #include <tqtooltip.h> -KRSqueezedTextLabel::KRSqueezedTextLabel( const TQString &text , TQWidget *parent, const char *name ) - : TQLabel ( parent, name ) { +KRSqueezedTextLabel::KRSqueezedTextLabel( const TQString &text , TQWidget *tqparent, const char *name ) + : TQLabel ( tqparent, name ) { tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); fullText = text; squeezeTextToLabel(); } -KRSqueezedTextLabel::KRSqueezedTextLabel( TQWidget *parent, const char *name ) - : TQLabel ( parent, name ) { +KRSqueezedTextLabel::KRSqueezedTextLabel( TQWidget *tqparent, const char *name ) + : TQLabel ( tqparent, name ) { tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); } diff --git a/libkdepim/krsqueezedtextlabel.h b/libkdepim/krsqueezedtextlabel.h index 13627252a..0b54da784 100644 --- a/libkdepim/krsqueezedtextlabel.h +++ b/libkdepim/krsqueezedtextlabel.h @@ -18,14 +18,14 @@ Boston, MA 02110-1301, USA. */ -#ifndef KRSQUEEZEDTEXTLABEL_H -#define KRSQUEEZEDTEXTLABEL_H +#ifndef KRSTQUEEZEDTEXTLABEL_H +#define KRSTQUEEZEDTEXTLABEL_H #include <tqlabel.h> #include <kdepimmacros.h> /** - * @short A tqreplacement for TQLabel that squeezes its text + * @short A replacement for TQLabel that squeezes its text * * A label class that squeezes its text into the label * @@ -36,17 +36,18 @@ */ /* - * QLabel + * TQLabel */ class KDE_EXPORT KRSqueezedTextLabel : public TQLabel { Q_OBJECT + TQ_OBJECT public: /** * Default constructor. */ - KRSqueezedTextLabel( TQWidget *parent, const char *name = 0 ); - KRSqueezedTextLabel( const TQString &text, TQWidget *parent, const char *name = 0 ); + KRSqueezedTextLabel( TQWidget *tqparent, const char *name = 0 ); + KRSqueezedTextLabel( const TQString &text, TQWidget *tqparent, const char *name = 0 ); virtual TQSize tqminimumSizeHint() const; virtual TQSize tqsizeHint() const; @@ -71,4 +72,4 @@ protected: }; -#endif // KRSQUEEZEDTEXTLABEL_H +#endif // KRSTQUEEZEDTEXTLABEL_H diff --git a/libkdepim/kscoring.cpp b/libkdepim/kscoring.cpp index c9d1f6143..8c5f737e6 100644 --- a/libkdepim/kscoring.cpp +++ b/libkdepim/kscoring.cpp @@ -15,10 +15,10 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US */ #ifdef KDE_USE_FINAL -#undef QT_NO_ASCII_CAST +#undef TQT_NO_ASCII_CAST #endif -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include <iostream> @@ -39,7 +39,7 @@ //---------------------------------------------------------------------------- -// a small function to encode attribute values, code stolen from QDom +// a small function to encode attribute values, code stolen from TQDom static TQString toXml(const TQString& str) { TQString tmp(str); @@ -101,7 +101,7 @@ void NotifyDialog::display(ScorableArticle& a, const TQString& s) if (!me) me = new NotifyDialog(); me->msg = s; - NotesMap::Iterator i = dict.find(s); + NotesMap::Iterator i = dict.tqfind(s); if (i == dict.end() || i.data()) { TQString msg = i18n("Article\n<b>%1</b><br><b>%2</b><br>caused the following" " note to appear:<br>%3"). @@ -348,10 +348,10 @@ NotifyCollection::~NotifyCollection() void NotifyCollection::addNote(const ScorableArticle& a, const TQString& note) { - article_list *l = notifyList.find(note); + article_list *l = notifyList.tqfind(note); if (!l) { notifyList.insert(note,new article_list); - l = notifyList.find(note); + l = notifyList.tqfind(note); } article_info i; i.from = a.from(); @@ -409,7 +409,7 @@ KScoringExpression::KScoringExpression(const TQString& h, const TQString& t, con expr.setCaseSensitive( true ); } else if (t == "CONTAINS" ) cond = CONTAINS; - else if (t == "EQUALS" ) cond = EQUALS; + else if (t == "ETQUALS" ) cond = ETQUALS; else if (t == "GREATER") { cond = GREATER; expr_int = expr_str.toInt(); @@ -435,7 +435,7 @@ int KScoringExpression::getConditionForName(const TQString& s) if (s == getNameForCondition(CONTAINS)) return CONTAINS; else if (s == getNameForCondition(MATCH)) return MATCH; else if (s == getNameForCondition(MATCHCS)) return MATCHCS; - else if (s == getNameForCondition(EQUALS)) return EQUALS; + else if (s == getNameForCondition(ETQUALS)) return ETQUALS; else if (s == getNameForCondition(SMALLER)) return SMALLER; else if (s == getNameForCondition(GREATER)) return GREATER; else { @@ -452,7 +452,7 @@ TQString KScoringExpression::getNameForCondition(int cond) case CONTAINS: return i18n("Contains Substring"); case MATCH: return i18n("Matches Regular Expression"); case MATCHCS: return i18n("Matches Regular Expression (Case Sensitive)"); - case EQUALS: return i18n("Is Exactly the Same As"); + case ETQUALS: return i18n("Is Exactly the Same As"); case SMALLER: return i18n("Less Than"); case GREATER: return i18n("Greater Than"); default: @@ -469,7 +469,7 @@ TQStringList KScoringExpression::conditionNames() l << getNameForCondition(CONTAINS); l << getNameForCondition(MATCH); l << getNameForCondition(MATCHCS); - l << getNameForCondition(EQUALS); + l << getNameForCondition(ETQUALS); l << getNameForCondition(SMALLER); l << getNameForCondition(GREATER); return l; @@ -510,11 +510,11 @@ bool KScoringExpression::match(ScorableArticle& a) const if (!head.isEmpty()) { switch (cond) { - case EQUALS: + case ETQUALS: res = (head.lower() == expr_str.lower()); break; case CONTAINS: - res = (head.lower().find(expr_str.lower()) >= 0); + res = (head.lower().tqfind(expr_str.lower()) >= 0); break; case MATCH: case MATCHCS: @@ -569,7 +569,7 @@ TQString KScoringExpression::getTypeString(int cond) case CONTAINS: return "CONTAINS"; case MATCH: return "MATCH"; case MATCHCS: return "MATCHCS"; - case EQUALS: return "EQUALS"; + case ETQUALS: return "ETQUALS"; case SMALLER: return "SMALLER"; case GREATER: return "GREATER"; default: diff --git a/libkdepim/kscoring.h b/libkdepim/kscoring.h index 9623c2285..766591ed1 100644 --- a/libkdepim/kscoring.h +++ b/libkdepim/kscoring.h @@ -186,7 +186,7 @@ class KDE_EXPORT KScoringExpression { friend class KScoringRule; public: - enum Condition { CONTAINS, MATCH, EQUALS, SMALLER, GREATER, MATCHCS }; + enum Condition { CONTAINS, MATCH, ETQUALS, SMALLER, GREATER, MATCHCS }; KScoringExpression(const TQString&,const TQString&,const TQString&, const TQString&); ~KScoringExpression(); @@ -300,15 +300,16 @@ private: //---------------------------------------------------------------------------- // Manages the score rules. -class KDE_EXPORT KScoringManager : public QObject +class KDE_EXPORT KScoringManager : public TQObject { Q_OBJECT + TQ_OBJECT public: //* this is the container for all rules typedef TQPtrList<KScoringRule> ScoringRuleList; - KScoringManager(const TQString& appName = TQString::null); + KScoringManager(const TQString& appName = TQString()); virtual ~KScoringManager(); //* returns a list of all available groups, must be overridden @@ -409,6 +410,7 @@ class KDE_EXPORT KScoringManager : public QObject class KDE_EXPORT NotifyDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: static void display(ScorableArticle&,const TQString&); protected slots: diff --git a/libkdepim/kscoringeditor.cpp b/libkdepim/kscoringeditor.cpp index de76d3e81..7cec1a7db 100644 --- a/libkdepim/kscoringeditor.cpp +++ b/libkdepim/kscoringeditor.cpp @@ -15,7 +15,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US */ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kscoring.h" #include "kscoringeditor.h" @@ -160,9 +160,9 @@ ConditionEditWidget::ConditionEditWidget(KScoringManager *m, TQWidget *p, const ConditionEditWidget::~ConditionEditWidget() {} -TQWidget* ConditionEditWidget::createWidget(TQWidget *parent) +TQWidget* ConditionEditWidget::createWidget(TQWidget *tqparent) { - return new SingleConditionWidget(manager,parent); + return new SingleConditionWidget(manager,tqparent); } void ConditionEditWidget::clearWidget(TQWidget *w) @@ -226,7 +226,7 @@ SingleActionWidget::SingleActionWidget(KScoringManager *m,TQWidget *p, const cha // init widget stack and the types combo box int index = 1; - types->insertItem(TQString::null); + types->insertItem(TQString()); TQStringList l = ActionBase::userNames(); for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it ) { TQString name = *it; @@ -334,9 +334,9 @@ ActionEditWidget::ActionEditWidget(KScoringManager *m,TQWidget *p, const char *n ActionEditWidget::~ActionEditWidget() {} -TQWidget* ActionEditWidget::createWidget( TQWidget *parent ) +TQWidget* ActionEditWidget::createWidget( TQWidget *tqparent ) { - return new SingleActionWidget(manager,parent); + return new SingleActionWidget(manager,tqparent); } void ActionEditWidget::slotEditRule(KScoringRule *rule) @@ -390,7 +390,7 @@ void ActionEditWidget::clearWidget(TQWidget *w) // //============================================================================ RuleEditWidget::RuleEditWidget(KScoringManager *m,TQWidget *p, const char *n) - : TQWidget(p,n), dirty(false), manager(m), oldRuleName(TQString::null) + : TQWidget(p,n), dirty(false), manager(m), oldRuleName(TQString()) { kdDebug(5100) << "RuleEditWidget::RuleEditWidget()" << endl; if ( !n ) setName( "RuleEditWidget" ); @@ -533,12 +533,12 @@ void RuleEditWidget::clearContents() expireEdit->setEnabled(false); condEditor->slotEditRule(0); actionEditor->slotEditRule(0); - oldRuleName = TQString::null; + oldRuleName = TQString(); } void RuleEditWidget::updateRule(KScoringRule *rule) { - oldRuleName = TQString::null; + oldRuleName = TQString(); TQString groups = groupsEdit->text(); if (groups.isEmpty()) rule->setGroups(TQStringList(".*")); @@ -746,7 +746,7 @@ void RuleListWidget::slotEditRule() emit ruleEdited(ruleList->currentText()); } else if (ruleList->count() == 0) - emit ruleEdited(TQString::null); + emit ruleEdited(TQString()); } void RuleListWidget::slotEditRule(TQListBoxItem* item) @@ -858,8 +858,8 @@ void RuleListWidget::slotRuleDown() KScoringEditor* KScoringEditor::scoreEditor = 0; KScoringEditor::KScoringEditor(KScoringManager* m, - TQWidget *parent, const char *name) - : KDialogBase(parent,name,false,i18n("Rule Editor"),Ok|Apply|Cancel,Ok,true), manager(m) + TQWidget *tqparent, const char *name) + : KDialogBase(tqparent,name,false,i18n("Rule Editor"),Ok|Apply|Cancel,Ok,true), manager(m) { manager->pushRuleList(); if (!scoreEditor) scoreEditor = this; @@ -896,10 +896,10 @@ KScoringEditor::~KScoringEditor() } KScoringEditor* KScoringEditor::createEditor(KScoringManager* m, - TQWidget *parent, const char *name) + TQWidget *tqparent, const char *name) { if (scoreEditor) return scoreEditor; - else return new KScoringEditor(m,parent,name); + else return new KScoringEditor(m,tqparent,name); } void KScoringEditor::setRule(KScoringRule* r) diff --git a/libkdepim/kscoringeditor.h b/libkdepim/kscoringeditor.h index 92421ccee..a4e9555d7 100644 --- a/libkdepim/kscoringeditor.h +++ b/libkdepim/kscoringeditor.h @@ -49,9 +49,10 @@ class KColorCombo; /** this widget implements an editor for one condition. It is used in ExpressionEditWidget */ -class KDE_EXPORT SingleConditionWidget : public QFrame +class KDE_EXPORT SingleConditionWidget : public TQFrame { Q_OBJECT + TQ_OBJECT friend class ConditionEditWidget; public: SingleConditionWidget(KScoringManager *,TQWidget *p =0, const char *n =0); @@ -84,6 +85,7 @@ private: class ConditionEditWidget: public KWidgetLister { Q_OBJECT + TQ_OBJECT public: ConditionEditWidget(KScoringManager *,TQWidget *p =0, const char *n =0); ~ConditionEditWidget(); @@ -99,9 +101,10 @@ private: /** this widget implements an editor for one action. It is used in ActionEditWidget */ -class SingleActionWidget : public QWidget +class SingleActionWidget : public TQWidget { Q_OBJECT + TQ_OBJECT friend class ActionEditWidget; public: SingleActionWidget(KScoringManager *m,TQWidget *p =0, const char *n =0); @@ -131,10 +134,11 @@ private: class KDE_EXPORT ActionEditWidget : public KWidgetLister { Q_OBJECT + TQ_OBJECT public: ActionEditWidget(KScoringManager *m,TQWidget *p =0, const char *n =0); ~ActionEditWidget(); - TQWidget* createWidget(TQWidget *parent); + TQWidget* createWidget(TQWidget *tqparent); void updateRule(KScoringRule*); void clearWidget(TQWidget *); public slots: @@ -145,9 +149,10 @@ private: /** This widget implements the rule editor */ -class RuleEditWidget : public QWidget +class RuleEditWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: RuleEditWidget(KScoringManager *m,TQWidget *p =0, const char *n =0); ~RuleEditWidget(); @@ -195,9 +200,10 @@ private: /** This widget shows a list of rules with buttons for copy, delete aso. */ -class KDE_EXPORT RuleListWidget : public QWidget +class KDE_EXPORT RuleListWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: RuleListWidget(KScoringManager *m, bool =false, TQWidget *p =0, const char *n =0); ~RuleListWidget(); @@ -248,14 +254,15 @@ private: class KDE_EXPORT KScoringEditor : public KDialogBase { Q_OBJECT + TQ_OBJECT public: ~KScoringEditor(); void setRule(KScoringRule*); - static KScoringEditor *createEditor(KScoringManager* m, TQWidget *parent=0, const char *name=0); + static KScoringEditor *createEditor(KScoringManager* m, TQWidget *tqparent=0, const char *name=0); static KScoringEditor *editor() { return scoreEditor; } void setDirty(); protected: - KScoringEditor(KScoringManager* m, TQWidget *parent=0, const char *name=0); + KScoringEditor(KScoringManager* m, TQWidget *tqparent=0, const char *name=0); private: /** the editor for the current rule */ RuleEditWidget* ruleEditor; @@ -278,8 +285,9 @@ private: class KScoringEditorWidgetDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KScoringEditorWidgetDialog(KScoringManager *m, const TQString& rName, TQWidget *parent=0, const char *name=0); + KScoringEditorWidgetDialog(KScoringManager *m, const TQString& rName, TQWidget *tqparent=0, const char *name=0); protected slots: void slotApply(); void slotOk(); @@ -291,9 +299,10 @@ private: TQString ruleName; }; -class KDE_EXPORT KScoringEditorWidget : public QWidget +class KDE_EXPORT KScoringEditorWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: KScoringEditorWidget(KScoringManager *m,TQWidget *p =0, const char *n =0); ~KScoringEditorWidget(); diff --git a/libkdepim/ksubscription.cpp b/libkdepim/ksubscription.cpp index f1c5b657a..cff384f2b 100644 --- a/libkdepim/ksubscription.cpp +++ b/libkdepim/ksubscription.cpp @@ -32,7 +32,7 @@ KGroupInfo::KGroupInfo(const TQString &name, const TQString &description, bool newGroup, bool subscribed, - Status status, TQString path) + tqStatus status, TQString path) : name(name), description(description), newGroup(newGroup), subscribed(subscribed), status(status), path(path) @@ -105,7 +105,7 @@ void GroupItem::setOn( bool on ) //------------------------------------------------------------------------------ void GroupItem::stateChange( bool on ) { - // delegate to parent + // delegate to tqparent if ( !mIgnoreStateChange ) mBrowser->changeItemState(this, on); } @@ -133,7 +133,7 @@ void GroupItem::setVisible( bool b ) TQListViewItem::setVisible(b); else { - // leave it visible so that children remain visible + // leave it visible so that tqchildren remain visible setOpen(true); setEnabled(false); } @@ -156,8 +156,8 @@ void GroupItem::setVisible( bool b ) for ( ; it.current(); ++it) { // move the checkitem to top - TQListViewItem* parent = it.current()->parent(); - if (parent) parent->takeItem(it.current()); + TQListViewItem* tqparent = it.current()->tqparent(); + if (tqparent) tqparent->takeItem(it.current()); listView()->insertItem(it.current()); } TQListViewItem::setVisible(false); @@ -206,9 +206,9 @@ void GroupItem::setup() //============================================================================= -KSubscription::KSubscription( TQWidget *parent, const TQString &caption, +KSubscription::KSubscription( TQWidget *tqparent, const TQString &caption, KAccount * acct, int buttons, const TQString &user1, bool descriptionColumn ) - : KDialogBase( parent, 0, true, caption, buttons | Help | Ok | Cancel, Ok, + : KDialogBase( tqparent, 0, true, caption, buttons | Help | Ok | Cancel, Ok, true, i18n("Reload &List"), user1 ), mAcct( acct ) { @@ -445,10 +445,10 @@ void KSubscription::changeItemState( GroupItem* item, bool on ) { if (!itemInListView(unsubView, item->info())) { - TQListViewItem *p = item->parent(); + TQListViewItem *p = item->tqparent(); while (p) { - // make sure all parents are subscribed + // make sure all tqparents are subscribed GroupItem* pi = static_cast<GroupItem*>(p); if (pi->isCheckItem() && !pi->isOn()) { @@ -457,7 +457,7 @@ void KSubscription::changeItemState( GroupItem* item, bool on ) pi->setIgnoreStateChange(false); new GroupItem(subView, pi->info(), this); } - p = p->parent(); + p = p->tqparent(); } new GroupItem(subView, item->info(), this); } @@ -511,7 +511,7 @@ void KSubscription::filterChanged( TQListViewItem* item, const TQString & text ) continue; } if ( !text.isEmpty() && - gr->text(0).find(text, 0, false) == -1) + gr->text(0).tqfind(text, 0, false) == -1) { // searchfield gr->setVisible(false); @@ -560,7 +560,7 @@ void KSubscription::restoreOriginalParent() { TQListViewItem* origParent = static_cast<GroupItem*>(it.current())-> originalParent(); - if (origParent && origParent != it.current()->parent()) + if (origParent && origParent != it.current()->tqparent()) { // remember this to avoid messing up the iterator move.append(it.current()); @@ -569,7 +569,7 @@ void KSubscription::restoreOriginalParent() TQPtrListIterator<TQListViewItem> it2( move ); for ( ; it2.current(); ++it2) { - // restore the original parent + // restore the original tqparent TQListViewItem* origParent = static_cast<GroupItem*>(it2.current())-> originalParent(); groupView->takeItem(it2.current()); @@ -612,12 +612,12 @@ void KSubscription::slotLoadingComplete() noTreeCB->setEnabled(true); subCB->setEnabled(true); - // remember the correct parent + // remember the correct tqparent TQListViewItemIterator it(groupView); for ( ; it.current(); ++it) { static_cast<GroupItem*>(it.current())-> - setOriginalParent( it.current()->parent() ); + setOriginalParent( it.current()->tqparent() ); } emit listChanged(); diff --git a/libkdepim/ksubscription.h b/libkdepim/ksubscription.h index cb177d20c..f9ce044aa 100644 --- a/libkdepim/ksubscription.h +++ b/libkdepim/ksubscription.h @@ -45,20 +45,20 @@ class KAccount; class KDE_EXPORT KGroupInfo { public: - enum Status { + enum tqStatus { unknown, readOnly, postingAllowed, moderated }; - KGroupInfo( const TQString &name, const TQString &description = TQString::null, + KGroupInfo( const TQString &name, const TQString &description = TQString(), bool newGroup = false, bool subscribed = false, - Status status = unknown, TQString path = TQString::null ); + tqStatus status = unknown, TQString path = TQString() ); TQString name, description; bool newGroup, subscribed; - Status status; + tqStatus status; TQString path; bool operator== (const KGroupInfo &gi2); @@ -69,7 +69,7 @@ class KDE_EXPORT KGroupInfo //========================================================================== /** A class representing a single group item (what's that?) */ -class KDE_EXPORT GroupItem : public QCheckListItem +class KDE_EXPORT GroupItem : public TQCheckListItem { public: GroupItem( TQListView *v, const KGroupInfo &gi, KSubscription* browser, @@ -84,10 +84,10 @@ class KDE_EXPORT GroupItem : public QCheckListItem void setInfo( KGroupInfo info ); /** - * Get/Set the original parent + * Get/Set the original tqparent */ TQListViewItem* originalParent() { return mOriginalParent; } - void setOriginalParent( TQListViewItem* parent ) { mOriginalParent = parent; } + void setOriginalParent( TQListViewItem* tqparent ) { mOriginalParent = tqparent; } /** * Get/Set the last open state @@ -132,27 +132,27 @@ class KDE_EXPORT GroupItem : public QCheckListItem /** * Reimplemented - * Calls TQListViewItem or QCheckListItem + * Calls TQListViewItem or TQCheckListItem */ virtual void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int align ); /** * Reimplemented - * Calls TQListViewItem or QCheckListItem + * Calls TQListViewItem or TQCheckListItem */ virtual void paintFocus( TQPainter *, const TQColorGroup & cg, const TQRect & r ); /** * Reimplemented - * Calls TQListViewItem or QCheckListItem + * Calls TQListViewItem or TQCheckListItem */ virtual int width( const TQFontMetrics&, const TQListView*, int column) const; /** * Reimplemented - * Calls TQListViewItem or QCheckListItem + * Calls TQListViewItem or TQCheckListItem */ virtual void setup(); @@ -188,6 +188,7 @@ class KDE_EXPORT GroupItem : public QCheckListItem class KDE_EXPORT KSubscription : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** @@ -198,8 +199,8 @@ class KDE_EXPORT KSubscription : public KDialogBase Right }; - KSubscription( TQWidget *parent, const TQString &caption, KAccount* acct, - int buttons = 0, const TQString &user1 = TQString::null, + KSubscription( TQWidget *tqparent, const TQString &caption, KAccount* acct, + int buttons = 0, const TQString &user1 = TQString(), bool descriptionColumn = true ); ~KSubscription(); @@ -280,7 +281,7 @@ class KDE_EXPORT KSubscription : public KDialogBase * criteria changed */ void filterChanged( TQListViewItem* item = 0, - const TQString & text = TQString::null ); + const TQString & text = TQString() ); /** * The amount of items that are visible and enabled diff --git a/libkdepim/ktimeedit.cpp b/libkdepim/ktimeedit.cpp index 9b9559523..7512b89ee 100644 --- a/libkdepim/ktimeedit.cpp +++ b/libkdepim/ktimeedit.cpp @@ -20,8 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqkeycode.h> @@ -40,10 +40,10 @@ // Validator for a time value with only hours and minutes (no seconds) // Mostly locale aware. Author: David Faure <faure@kde.org> -class KOTimeValidator : public QValidator +class KOTimeValidator : public TQValidator { public: - KOTimeValidator(TQWidget* parent, const char* name=0) : TQValidator(parent, name) {} + KOTimeValidator(TQWidget* tqparent, const char* name=0) : TQValidator(tqparent, name) {} virtual State validate(TQString& str, int& /*cursorPos*/) const { @@ -102,11 +102,11 @@ public: } }; -// KTimeWidget/QTimeEdit provide nicer editing, but don't provide a combobox. +// KTimeWidget/TQTimeEdit 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" tqmask would help. -KTimeEdit::KTimeEdit( TQWidget *parent, TQTime qt, const char *name ) - : TQComboBox( true, parent, name ) +// But TQt-3.2 will offer TQLineEdit::setMask, so a "99:99" tqmask would help. +KTimeEdit::KTimeEdit( TQWidget *tqparent, TQTime qt, const char *name ) + : TQComboBox( true, tqparent, name ) { setInsertionPolicy( NoInsertion ); setValidator( new KOTimeValidator( this ) ); diff --git a/libkdepim/ktimeedit.h b/libkdepim/ktimeedit.h index 609c64007..1bd86bdf1 100644 --- a/libkdepim/ktimeedit.h +++ b/libkdepim/ktimeedit.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef _KTIMEEDIT_H #define _KTIMEEDIT_H @@ -41,12 +41,13 @@ @short Provides a way to edit times in a user-friendly manner. @author Preston Brown, Ian Dawes */ -class KDE_EXPORT KTimeEdit : public QComboBox +class KDE_EXPORT KTimeEdit : public TQComboBox { Q_OBJECT + TQ_OBJECT public: /** constructs a new time edit. */ - KTimeEdit(TQWidget *parent=0, TQTime qt=TQTime(12,0), const char *name=0); + KTimeEdit(TQWidget *tqparent=0, TQTime qt=TQTime(12,0), const char *name=0); virtual ~KTimeEdit(); diff --git a/libkdepim/kvcarddrag.cpp b/libkdepim/kvcarddrag.cpp index 1217d6fba..3a65b70c7 100644 --- a/libkdepim/kvcarddrag.cpp +++ b/libkdepim/kvcarddrag.cpp @@ -41,7 +41,7 @@ KVCardDrag::KVCardDrag( TQWidget *dragsource, const char *name ) #if defined(KABC_VCARD_ENCODING_FIX) setVCard( TQByteArray() ); #else - setVCard( TQString::null ); + setVCard( TQString() ); #endif } diff --git a/libkdepim/kvcarddrag.h b/libkdepim/kvcarddrag.h index 3e99a0e6d..8e84f13bd 100644 --- a/libkdepim/kvcarddrag.h +++ b/libkdepim/kvcarddrag.h @@ -35,11 +35,12 @@ class KVCardDragPrivate; * A drag-and-drop object for vcards. The according MIME type * is set to text/x-vcard. * - * See the Qt drag'n'drop documentation. + * See the TQt drag'n'drop documentation. */ -class KDE_EXPORT KVCardDrag : public QStoredDrag +class KDE_EXPORT KVCardDrag : public TQStoredDrag { Q_OBJECT + TQ_OBJECT public: /** @@ -66,7 +67,7 @@ class KDE_EXPORT KVCardDrag : public QStoredDrag void setVCard( const TQString &content ); #endif /** - * Returns true if the MIME source @p e tqcontains a vcard object. + * Returns true if the MIME source @p e contains a vcard object. */ static bool canDecode( TQMimeSource *e ); diff --git a/libkdepim/kwidgetlister.cpp b/libkdepim/kwidgetlister.cpp index 13e1675b7..bc9d89803 100644 --- a/libkdepim/kwidgetlister.cpp +++ b/libkdepim/kwidgetlister.cpp @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this library with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -43,13 +43,13 @@ #include <kpushbutton.h> #include <kdialog.h> -KWidgetLister::KWidgetLister( int minWidgets, int maxWidgets, TQWidget *parent, const char* name ) - : TQWidget( parent, name ) +KWidgetLister::KWidgetLister( int minWidgets, int maxWidgets, TQWidget *tqparent, const char* name ) + : TQWidget( tqparent, name ) { mWidgetList.setAutoDelete(TRUE); - mMinWidgets = QMAX( minWidgets, 1 ); - mMaxWidgets = QMAX( maxWidgets, mMinWidgets + 1 ); + mMinWidgets = TQMAX( minWidgets, 1 ); + mMaxWidgets = TQMAX( maxWidgets, mMinWidgets + 1 ); //--------- the button box mLayout = new TQVBoxLayout(this, 0, 4); @@ -146,15 +146,15 @@ void KWidgetLister::clearWidget( TQWidget* /*aWidget*/ ) { } -TQWidget* KWidgetLister::createWidget( TQWidget* parent ) +TQWidget* KWidgetLister::createWidget( TQWidget* tqparent ) { - return new TQWidget( parent ); + return new TQWidget( tqparent ); } void KWidgetLister::setNumberOfShownWidgetsTo( int aNum ) { - int superfluousWidgets = QMAX( (int)mWidgetList.count() - aNum, 0 ); - int missingWidgets = QMAX( aNum - (int)mWidgetList.count(), 0 ); + int superfluousWidgets = TQMAX( (int)mWidgetList.count() - aNum, 0 ); + int missingWidgets = TQMAX( aNum - (int)mWidgetList.count(), 0 ); // remove superfluous widgets for ( ; superfluousWidgets ; superfluousWidgets-- ) diff --git a/libkdepim/kwidgetlister.h b/libkdepim/kwidgetlister.h index 19616aa1f..9af7bb9b3 100644 --- a/libkdepim/kwidgetlister.h +++ b/libkdepim/kwidgetlister.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this library with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -62,11 +62,12 @@ class TQHBox; */ -class KDE_EXPORT KWidgetLister : public QWidget +class KDE_EXPORT KWidgetLister : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KWidgetLister( int minWidgets=1, int maxWidgets=8, TQWidget* parent=0, const char* name=0 ); + KWidgetLister( int minWidgets=1, int maxWidgets=8, TQWidget* tqparent=0, const char* name=0 ); virtual ~KWidgetLister(); protected slots: @@ -99,7 +100,7 @@ protected: when showing it on screen. Make sure you call this implementaion, though, since you cannot put the widget on screen from derived classes (@p mLayout is private). - Make sure the parent of the TQWidget to add is this KWidgetLister. */ + Make sure the tqparent of the TQWidget to add is this KWidgetLister. */ virtual void addWidgetAtEnd(TQWidget *w =0); /** Removes a single (always the last) widget. Doesn't care if there are still only @ref mMinWidgets left on screen and whether it @@ -115,8 +116,8 @@ 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 tqreplaces the "@p new @p T" call. */ - virtual TQWidget* createWidget( TQWidget *parent ); + function which replaces the "@p new @p T" call. */ + virtual TQWidget* createWidget( TQWidget *tqparent ); /** Sets the number of widgets on scrren to exactly @p aNum. Doesn't check if @p aNum is inside the range @p [mMinWidgets,mMaxWidgets]. */ diff --git a/libkdepim/kxface.cpp b/libkdepim/kxface.cpp index 9813da7cc..6af87cef9 100644 --- a/libkdepim/kxface.cpp +++ b/libkdepim/kxface.cpp @@ -86,7 +86,7 @@ KXFace::~KXFace() TQString KXFace::fromImage( const TQImage &image ) { if( image.isNull() ) - return TQString::null; + return TQString(); TQImage scaledImg = image.smoothScale( 48, 48 ); TQByteArray ba; @@ -94,8 +94,8 @@ TQString KXFace::fromImage( const TQImage &image ) buffer.open( IO_WriteOnly ); scaledImg.save( &buffer, "XBM" ); TQString xbm( ba ); - xbm.remove( 0, xbm.find( "{" ) + 1 ); - xbm.truncate( xbm.find( "}" ) ); + xbm.remove( 0, xbm.tqfind( "{" ) + 1 ); + xbm.truncate( xbm.tqfind( "}" ) ); xbm.remove( " " ); xbm.remove( "," ); xbm.remove( "0x" ); diff --git a/libkdepim/kxface.h b/libkdepim/kxface.h index ca3fb8e0a..921c1f248 100644 --- a/libkdepim/kxface.h +++ b/libkdepim/kxface.h @@ -519,9 +519,10 @@ class TQString; namespace KPIM { - class KDE_EXPORT KXFace : public QObject + class KDE_EXPORT KXFace : public TQObject { Q_OBJECT + TQ_OBJECT public: KXFace(); diff --git a/libkdepim/ldapclient.cpp b/libkdepim/ldapclient.cpp index bf4f995ed..651c86159 100644 --- a/libkdepim/ldapclient.cpp +++ b/libkdepim/ldapclient.cpp @@ -62,8 +62,8 @@ TQString LdapObject::toString() const void LdapObject::clear() { - dn = TQString::null; - objectClass = TQString::null; + dn = TQString(); + objectClass = TQString(); attrs.clear(); } @@ -76,8 +76,8 @@ void LdapObject::assign( const LdapObject& that ) } } -LdapClient::LdapClient( int clientNumber, TQObject* parent, const char* name ) - : TQObject( parent, name ), mJob( 0 ), mActive( false ), mReportObjectClass( false ) +LdapClient::LdapClient( int clientNumber, TQObject* tqparent, const char* name ) + : TQObject( tqparent, name ), mJob( 0 ), mActive( false ), mReportObjectClass( false ) { // d = new LdapClientPrivate; mClientNumber = clientNumber; @@ -196,7 +196,7 @@ void LdapClient::finishCurrentObject() mCurrentObject.dn = mLdif.dn(); const TQString sClass( mCurrentObject.objectClass.lower() ); if( sClass == "groupofnames" || sClass == "kolabgroupofnames" ){ - LdapAttrMap::ConstIterator it = mCurrentObject.attrs.find("mail"); + LdapAttrMap::ConstIterator it = mCurrentObject.attrs.tqfind("mail"); if( it == mCurrentObject.attrs.end() ){ // No explicit mail address found so far? // Fine, then we use the address stored in the DN. @@ -423,11 +423,11 @@ void LdapSearch::startSearch( const TQString& txt ) cancelSearch(); - int pos = txt.find( '\"' ); + int pos = txt.tqfind( '\"' ); if( pos >= 0 ) { ++pos; - int pos2 = txt.find( '\"', pos ); + int pos2 = txt.tqfind( '\"', pos ); if( pos2 >= 0 ) mSearchText = txt.mid( pos , pos2 - pos ); else diff --git a/libkdepim/ldapclient.h b/libkdepim/ldapclient.h index cf3f55827..dba6f1c3f 100644 --- a/libkdepim/ldapclient.h +++ b/libkdepim/ldapclient.h @@ -106,7 +106,7 @@ class LdapObject { public: LdapObject() - : dn( TQString::null ), client( 0 ) {} + : dn( TQString() ), client( 0 ) {} explicit LdapObject( const TQString& _dn, LdapClient* _cl ) : dn( _dn ), client( _cl ) {} LdapObject( const LdapObject& that ) { assign( that ); } @@ -139,12 +139,13 @@ class LdapObject * We mean it! * */ -class KDE_EXPORT LdapClient : public QObject +class KDE_EXPORT LdapClient : public TQObject { Q_OBJECT + TQ_OBJECT public: - LdapClient( int clientNumber, TQObject* parent = 0, const char* name = 0 ); + LdapClient( int clientNumber, TQObject* tqparent = 0, const char* name = 0 ); virtual ~LdapClient(); /*! returns true if there is a query running */ @@ -242,9 +243,10 @@ typedef TQValueList<LdapResult> LdapResultList; * We mean it! * */ -class KDE_EXPORT LdapSearch : public QObject +class KDE_EXPORT LdapSearch : public TQObject { Q_OBJECT + TQ_OBJECT public: LdapSearch(); diff --git a/libkdepim/ldapsearchdialog.cpp b/libkdepim/ldapsearchdialog.cpp index 37b29f6d0..2297e17e4 100644 --- a/libkdepim/ldapsearchdialog.cpp +++ b/libkdepim/ldapsearchdialog.cpp @@ -44,7 +44,7 @@ using namespace KPIM; static TQString asUtf8( const TQByteArray &val ) { if ( val.isEmpty() ) - return TQString::null; + return TQString(); const char *data = val.data(); @@ -101,8 +101,8 @@ namespace KPIM { class ContactListItem : public TQListViewItem { public: - ContactListItem( TQListView* parent, const KPIM::LdapAttrMap& attrs ) - : TQListViewItem( parent ), mAttrs( attrs ) + ContactListItem( TQListView* tqparent, const KPIM::LdapAttrMap& attrs ) + : TQListViewItem( tqparent ), mAttrs( attrs ) { const KPIM::LdapAttrValue &mailAttrs = attrs[ "mail" ]; if ( mailAttrs.isEmpty() ) { @@ -124,9 +124,9 @@ class ContactListItem : public TQListViewItem } -LDAPSearchDialog::LDAPSearchDialog( TQWidget* parent, const char* name ) +LDAPSearchDialog::LDAPSearchDialog( TQWidget* tqparent, const char* name ) : KDialogBase( Plain, i18n( "Search for Addresses in Directory" ), Help | User1 | - User2 | User3 | Cancel, Default, parent, name, false, true ) + User2 | User3 | Cancel, Default, tqparent, name, false, true ) { setButtonCancel( KStdGuiItem::close() ); TQFrame *page = plainPage(); @@ -136,7 +136,7 @@ LDAPSearchDialog::LDAPSearchDialog( TQWidget* parent, const char* name ) page ); groupBox->setFrameShape( TQGroupBox::Box ); groupBox->setFrameShadow( TQGroupBox::Sunken ); - groupBox->setColumnLayout( 0, Qt::Vertical ); + groupBox->setColumnLayout( 0, TQt::Vertical ); TQGridLayout *boxLayout = new TQGridLayout( groupBox->tqlayout(), 2, 5, spacingHint() ); boxLayout->setColStretch( 1, 1 ); @@ -363,7 +363,7 @@ TQString LDAPSearchDialog::makeFilter( const TQString& query, const TQString& at result = result.arg( "telephoneNumber" ).arg( query ); } else { // Error? - result = TQString::null; + result = TQString(); return result; } } @@ -375,7 +375,7 @@ void LDAPSearchDialog::slotStartSearch() { cancelQuery(); - TQApplication::setOverrideCursor( Qt::waitCursor ); + TQApplication::setOverrideCursor( TQt::waitCursor ); mSearchButton->setText( i18n( "Stop" ) ); disconnect( mSearchButton, TQT_SIGNAL( clicked() ), diff --git a/libkdepim/ldapsearchdialog.h b/libkdepim/ldapsearchdialog.h index 9b19e5246..4b647acae 100644 --- a/libkdepim/ldapsearchdialog.h +++ b/libkdepim/ldapsearchdialog.h @@ -38,9 +38,10 @@ namespace KPIM { class LDAPSearchDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - LDAPSearchDialog( TQWidget* parent, const char* name = 0 ); + LDAPSearchDialog( TQWidget* tqparent, const char* name = 0 ); ~LDAPSearchDialog(); bool isOK() const { return mIsOK; } diff --git a/libkdepim/linklocator.cpp b/libkdepim/linklocator.cpp index 46542f89b..6a79dff15 100644 --- a/libkdepim/linklocator.cpp +++ b/libkdepim/linklocator.cpp @@ -92,14 +92,14 @@ TQString LinkLocator::getUrl() // handle cases like this: <link>http://foobar.org/</link> int start = mPos; while(mPos < (int)mText.length() && mText[mPos] > ' ' && mText[mPos] != '"' && - TQString("<>()[]").find(mText[mPos]) == -1) + TQString("<>()[]").tqfind(mText[mPos]) == -1) { ++mPos; } /* some URLs really end with: # / & - _ */ const TQString allowedSpecialChars = TQString("#/&-_"); while(mPos > start && mText[mPos-1].isPunct() && - allowedSpecialChars.find(mText[mPos-1]) == -1 ) + allowedSpecialChars.tqfind(mText[mPos-1]) == -1 ) { --mPos; } @@ -128,7 +128,7 @@ bool LinkLocator::atUrl() const // the character directly before the URL must not be a letter, a number or // any other character allowed in a dot-atom (RFC 2822). if( ( mPos > 0 ) && ( mText[mPos-1].isLetterOrNumber() || - ( allowedSpecialChars.find( mText[mPos-1] ) != -1 ) ) ) + ( allowedSpecialChars.tqfind( mText[mPos-1] ) != -1 ) ) ) return false; TQChar ch = mText[mPos]; @@ -179,7 +179,7 @@ TQString LinkLocator::getEmailAddress() while ( start >= 0 && mText[start].tqunicode() < 128 && ( mText[start].isLetterOrNumber() || mText[start] == '@' || // allow @ to find invalid email addresses - allowedSpecialChars.find( mText[start] ) != -1 ) ) { + allowedSpecialChars.tqfind( mText[start] ) != -1 ) ) { if ( mText[start] == '@' ) return TQString(); // local part tqcontains '@' -> no email address --start; @@ -202,7 +202,7 @@ TQString LinkLocator::getEmailAddress() if ( mText[end] == '@' ) return TQString(); // domain part tqcontains '@' -> no email address if ( mText[end] == '.' ) - dotPos = QMIN( dotPos, end ); // remember index of first dot in domain + dotPos = TQMIN( dotPos, end ); // remember index of first dot in domain ++end; } // we assume that an email address ends with a letter or a digit @@ -314,7 +314,7 @@ TQString LinkLocator::convertToHtml(const TQString& plainText, int flags, if(!str.isEmpty()) { // len is the length of the local part - int len = str.find('@'); + int len = str.tqfind('@'); TQString localPart = str.left(len); // remove the local part from the result (as '&'s have been expanded to @@ -353,11 +353,11 @@ TQString LinkLocator::convertToHtml(const TQString& plainText, int flags, TQString LinkLocator::pngToDataUrl( const TQString & iconPath ) { if ( iconPath.isEmpty() ) - return TQString::null; + return TQString(); TQFile pngFile( iconPath ); if ( !pngFile.open( IO_ReadOnly | IO_Raw ) ) - return TQString::null; + return TQString(); TQByteArray ba = pngFile.readAll(); pngFile.close(); @@ -370,12 +370,12 @@ TQString LinkLocator::getEmoticon() { // smileys have to be prepended by whitespace if ( ( mPos > 0 ) && !mText[mPos-1].isSpace() ) - return TQString::null; + return TQString(); // since smileys start with ':', ';', '(' or '8' short circuit method const TQChar ch = mText[mPos]; if ( ch !=':' && ch != ';' && ch != '(' && ch != '8' ) - return TQString::null; + return TQString(); // find the end of the smiley (a smiley is at most 4 chars long and ends at // lineend or whitespace) @@ -387,11 +387,11 @@ TQString LinkLocator::getEmoticon() !mText[mPos+smileyLen].isSpace() ) smileyLen++; if ( smileyLen < MinSmileyLen || smileyLen > MaxSmileyLen ) - return TQString::null; + return TQString(); const TQString smiley = mText.mid( mPos, smileyLen ); if ( !s_smileyEmoticonNameMap->tqcontains( smiley ) ) - return TQString::null; // that's not a (known) smiley + return TQString(); // that's not a (known) smiley TQString htmlRep; if ( s_smileyEmoticonHTMLCache->tqcontains( smiley ) ) { @@ -415,7 +415,7 @@ TQString LinkLocator::getEmoticon() const TQString dataUrl = pngToDataUrl( iconPath ); if ( dataUrl.isEmpty() ) { - htmlRep = TQString::null; + htmlRep = TQString(); } else { // create an image tag (the text in attribute alt is used @@ -439,18 +439,18 @@ TQString LinkLocator::highlightedText() { // formating symbols must be prepended with a whitespace if ( ( mPos > 0 ) && !mText[mPos-1].isSpace() ) - return TQString::null; + return TQString(); const TQChar ch = mText[mPos]; if ( ch != '/' && ch != '*' && ch != '_' ) - return TQString::null; + return TQString(); TQRegExp re = TQRegExp( TQString("\\%1([0-9A-Za-z]+)\\%2").arg( ch ).arg( ch ) ); if ( re.search( mText, mPos ) == mPos ) { uint length = re.matchedLength(); // there must be a whitespace after the closing formating symbol if ( mPos + length < mText.length() && !mText[mPos + length].isSpace() ) - return TQString::null; + return TQString(); mPos += length - 1; switch ( ch.latin1() ) { case '*': @@ -461,6 +461,6 @@ TQString LinkLocator::highlightedText() return "<i>" + re.cap( 1 ) + "</i>"; } } - return TQString::null; + return TQString(); } diff --git a/libkdepim/linklocator.h b/libkdepim/linklocator.h index 618bc6c8e..662202e44 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, tqreplace text smileys with + * - ReplaceSmileys, replace text smileys with * emoticon images. * - IgnoreUrls, doesn't parse any URLs. * - HighlightText, interprets text highlighting markup @@ -146,7 +146,7 @@ public: /** Embed the given PNG image into a data URL. * @param iconPath path to the PNG image - * @return A data URL, TQString::null if the image could not be read. + * @return A data URL, TQString() if the image could not be read. */ static TQString pngToDataUrl( const TQString & iconPath ); diff --git a/libkdepim/maillistdrag.cpp b/libkdepim/maillistdrag.cpp index 4f4a79bcc..3daf889e8 100644 --- a/libkdepim/maillistdrag.cpp +++ b/libkdepim/maillistdrag.cpp @@ -78,8 +78,8 @@ void MailSummary::set( TQ_UINT32 serialNumber, TQString messageId, mDate = date; } -MailListDrag::MailListDrag( MailList mailList, TQWidget * parent, MailTextSource *src ) - : TQStoredDrag( MailListDrag::format(), parent ), _src(src) +MailListDrag::MailListDrag( MailList mailList, TQWidget * tqparent, MailTextSource *src ) + : TQStoredDrag( MailListDrag::format(), tqparent ), _src(src) { setMailList( mailList ); } @@ -233,7 +233,7 @@ TQByteArray MailListDrag::tqencodedData(const char *mimeType) const TQByteArray enc = TQStoredDrag::tqencodedData(format()); decode(enc, ml); - KProgressDialog *dlg = new KProgressDialog(0, 0, TQString::null, i18n("Retrieving and storing messages..."), true); + KProgressDialog *dlg = new KProgressDialog(0, 0, TQString(), i18n("Retrieving and storing messages..."), true); dlg->setAllowCancel(true); dlg->progressBar()->setTotalSteps(ml.count()); int i = 0; diff --git a/libkdepim/maillistdrag.h b/libkdepim/maillistdrag.h index 7556cec5a..335fa3e28 100644 --- a/libkdepim/maillistdrag.h +++ b/libkdepim/maillistdrag.h @@ -92,11 +92,11 @@ public: }; // Drag and drop object for mails -class KDE_EXPORT MailListDrag : public QStoredDrag +class KDE_EXPORT MailListDrag : public TQStoredDrag { public: // Takes ownership of "src" and deletes it when done - MailListDrag( MailList, TQWidget * parent = 0, MailTextSource *src = 0 ); + MailListDrag( MailList, TQWidget * tqparent = 0, MailTextSource *src = 0 ); ~MailListDrag(); const char *format(int i) const; diff --git a/libkdepim/overlaywidget.cpp b/libkdepim/overlaywidget.cpp index 1369009f7..6ffc06d38 100644 --- a/libkdepim/overlaywidget.cpp +++ b/libkdepim/overlaywidget.cpp @@ -18,11 +18,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -31,8 +31,8 @@ #include "overlaywidget.h" using namespace KPIM; -OverlayWidget::OverlayWidget( TQWidget* alignWidget, TQWidget* parent, const char* name ) - : TQHBox( parent, name ), mAlignWidget( 0 ) +OverlayWidget::OverlayWidget( TQWidget* alignWidget, TQWidget* tqparent, const char* name ) + : TQHBox( tqparent, name ), mAlignWidget( 0 ) { setAlignWidget( alignWidget ); } diff --git a/libkdepim/overlaywidget.h b/libkdepim/overlaywidget.h index b9918468b..f49b46721 100644 --- a/libkdepim/overlaywidget.h +++ b/libkdepim/overlaywidget.h @@ -18,11 +18,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -41,12 +41,13 @@ namespace KPIM { * * OverlayWidget inherits TQHBox for convenience purposes (tqlayout, and frame) */ -class OverlayWidget : public QHBox +class OverlayWidget : public TQHBox { Q_OBJECT + TQ_OBJECT public: - OverlayWidget( TQWidget* alignWidget, TQWidget* parent, const char* name = 0 ); + OverlayWidget( TQWidget* alignWidget, TQWidget* tqparent, const char* name = 0 ); ~OverlayWidget(); TQWidget * alignWidget() { return mAlignWidget; } diff --git a/libkdepim/pluginloader.h b/libkdepim/pluginloader.h index 5ae0fbf87..d73dc9faa 100644 --- a/libkdepim/pluginloader.h +++ b/libkdepim/pluginloader.h @@ -31,7 +31,7 @@ namespace KPIM { * @author Marc Mutz <mutz@kde.org> based on KABC's FormatFactory * * This is a generic plugin loader / factory for small plugins that - * don't want to be QObjects. + * don't want to be TQObjects. * * @section Usage * diff --git a/libkdepim/progressdialog.cpp b/libkdepim/progressdialog.cpp index 8c0ab889a..2788afe21 100644 --- a/libkdepim/progressdialog.cpp +++ b/libkdepim/progressdialog.cpp @@ -19,11 +19,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -60,10 +60,10 @@ namespace KPIM { class TransactionItem; -TransactionItemView::TransactionItemView( TQWidget * parent, +TransactionItemView::TransactionItemView( TQWidget * tqparent, const char * name, WFlags f ) - : TQScrollView( parent, name, f ) { + : TQScrollView( tqparent, name, f ) { setFrameStyle( NoFrame ); mBigBox = new TQVBox( viewport() ); mBigBox->setSpacing( 5 ); @@ -84,9 +84,9 @@ 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 tqlayout in the parent (progressdialog) that our size changed + // Tell the tqlayout in the tqparent (progressdialog) that our size changed updateGeometry(); - // Resize the parent (progressdialog) - this works but resize horizontally too often + // Resize the tqparent (progressdialog) - this works but resize horizontally too often //tqparentWidget()->adjustSize(); TQApplication::sendPostedEvents( 0, TQEvent::ChildInserted ); @@ -112,8 +112,8 @@ TQSize TransactionItemView::tqminimumSizeHint() const 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 ); + sz.setWidth( TQMAX( sz.width(), minw ) + f + vsbExt ); + sz.setHeight( TQMIN( sz.height(), maxh ) + f ); return sz; } @@ -121,7 +121,7 @@ TQSize TransactionItemView::tqminimumSizeHint() const void TransactionItemView::slotLayoutFirstItem() { /* - The below relies on some details in Qt's behaviour regarding deleting + The below relies on some details in TQt's behaviour regarding deleting objects. This slot is called from the destroyed signal of an item just going away. That item is at that point still in the list of chilren, but since the vtable is already gone, it will have type TQObject. The first @@ -139,9 +139,9 @@ void TransactionItemView::slotLayoutFirstItem() // ---------------------------------------------------------------------------- -TransactionItem::TransactionItem( TQWidget* parent, +TransactionItem::TransactionItem( TQWidget* tqparent, ProgressItem *item, bool first ) - : TQVBox( parent, "TransactionItem" ), mCancelButton( 0 ), mItem( item ) + : TQVBox( tqparent, "TransactionItem" ), mCancelButton( 0 ), mItem( item ) { setSpacing( 2 ); @@ -159,15 +159,15 @@ 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->tqsetAlignment( Qt::AlignAuto | Qt::AlignVCenter | Qt::SingleLine ); + mItemLabel->setTextFormat( TQt::RichText ); + mItemLabel->tqsetAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::SingleLine ); h->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); mProgress = new TQProgressBar( 100, h ); mProgress->setProgress( item->progress() ); if ( item->canBeCanceled() ) { - mCancelButton = new TQPushButton( SmallIcon( "cancel" ), TQString::null, h ); + mCancelButton = new TQPushButton( SmallIcon( "cancel" ), TQString(), h ); TQToolTip::add( mCancelButton, i18n("Cancel this operation.") ); connect ( mCancelButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotItemCanceled() )); @@ -178,14 +178,14 @@ TransactionItem::TransactionItem( TQWidget* parent, h->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); mSSLLabel = new SSLLabel( h ); mSSLLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); - mItemStatus = new TQLabel( item->status(), h ); + mItemtqStatus = new TQLabel( item->status(), h ); // always interpret the status text as RichText, but disable word wrapping - mItemStatus->setTextFormat( Qt::RichText ); - mItemStatus->tqsetAlignment( Qt::AlignAuto | Qt::AlignVCenter | Qt::SingleLine ); + mItemtqStatus->setTextFormat( TQt::RichText ); + mItemtqStatus->tqsetAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::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->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ) ); - mItemStatus->setFixedHeight( mItemLabel->tqsizeHint().height() ); + mItemtqStatus->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ) ); + mItemtqStatus->setFixedHeight( mItemLabel->tqsizeHint().height() ); setCrypto( item->usesCrypto() ); if( first ) hideHLine(); } @@ -209,9 +209,9 @@ void TransactionItem::setLabel( const TQString& label ) mItemLabel->setText( label ); } -void TransactionItem::seStatus( const TQString& status ) +void TransactionItem::setqStatus( const TQString& status ) { - mItemStatus->setText( status ); + mItemtqStatus->setText( status ); } void TransactionItem::setCrypto( bool on ) @@ -244,11 +244,11 @@ void TransactionItem::addSubTransaction( ProgressItem* /*item*/ ) // --------------------------------------------------------------------------- -ProgressDialog::ProgressDialog( TQWidget* alignWidget, TQWidget* parent, const char* name ) - : OverlayWidget( alignWidget, parent, name ), mWasLastShown( false ) +ProgressDialog::ProgressDialog( TQWidget* alignWidget, TQWidget* tqparent, const char* name ) + : OverlayWidget( alignWidget, tqparent, name ), mWasLastShown( false ) { - setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); // QFrame - setSpacing( 0 ); // QHBox + setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); // TQFrame + setSpacing( 0 ); // TQHBox setMargin( 1 ); mScrollView = new TransactionItemView( this, "ProgressScrollView" ); @@ -278,8 +278,8 @@ ProgressDialog::ProgressDialog( TQWidget* alignWidget, TQWidget* parent, const c this, TQT_SLOT( slotTransactionCompleted( KPIM::ProgressItem* ) ) ); connect ( pm, TQT_SIGNAL( progressItemProgress( KPIM::ProgressItem*, unsigned int ) ), this, TQT_SLOT( slotTransactionProgress( KPIM::ProgressItem*, unsigned int ) ) ); - connect ( pm, TQT_SIGNAL( progressItemStatus( KPIM::ProgressItem*, const TQString& ) ), - this, TQT_SLOT( slotTransactionStatus( KPIM::ProgressItem*, const TQString& ) ) ); + connect ( pm, TQT_SIGNAL( progressItemtqStatus( KPIM::ProgressItem*, const TQString& ) ), + this, TQT_SLOT( slotTransactiontqStatus( KPIM::ProgressItem*, const TQString& ) ) ); connect ( pm, TQT_SIGNAL( progressItemLabel( KPIM::ProgressItem*, const TQString& ) ), this, TQT_SLOT( slotTransactionLabel( KPIM::ProgressItem*, const TQString& ) ) ); connect ( pm, TQT_SIGNAL( progressItemUsesCrypto(KPIM::ProgressItem*, bool) ), @@ -307,11 +307,11 @@ ProgressDialog::~ProgressDialog() void ProgressDialog::slotTransactionAdded( ProgressItem *item ) { - TransactionItem *parent = 0; - if ( item->parent() ) { - if ( mTransactionsToListviewItems.tqcontains( item->parent() ) ) { - parent = mTransactionsToListviewItems[ item->parent() ]; - parent->addSubTransaction( item ); + TransactionItem *tqparent = 0; + if ( item->tqparent() ) { + if ( mTransactionsToListviewItems.tqcontains( item->tqparent() ) ) { + tqparent = mTransactionsToListviewItems[ item->tqparent() ]; + tqparent->addSubTransaction( item ); } } else { const bool first = mTransactionsToListviewItems.empty(); @@ -353,12 +353,12 @@ void ProgressDialog::slotTransactionProgress( ProgressItem *item, } } -void ProgressDialog::slotTransactionStatus( ProgressItem *item, +void ProgressDialog::slotTransactiontqStatus( ProgressItem *item, const TQString& status ) { if ( mTransactionsToListviewItems.tqcontains( item ) ) { TransactionItem *ti = mTransactionsToListviewItems[ item ]; - ti->seStatus( status ); + ti->setqStatus( status ); } } diff --git a/libkdepim/progressdialog.h b/libkdepim/progressdialog.h index b9a29e4b6..26d9b94d5 100644 --- a/libkdepim/progressdialog.h +++ b/libkdepim/progressdialog.h @@ -20,11 +20,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -52,8 +52,9 @@ class SSLLabel; class TransactionItemView : public TQScrollView { Q_OBJECT + TQ_OBJECT public: - TransactionItemView( TQWidget * parent = 0, + TransactionItemView( TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 ); @@ -77,9 +78,10 @@ private: class TransactionItem : public TQVBox { Q_OBJECT + TQ_OBJECT public: - TransactionItem( TQWidget * parent, + TransactionItem( TQWidget * tqparent, ProgressItem* item, bool first ); ~TransactionItem(); @@ -88,7 +90,7 @@ public: void setProgress( int progress ); void setLabel( const TQString& ); - void seStatus( const TQString& ); + void setqStatus( const TQString& ); void setCrypto( bool ); void setTotalSteps( int totalSteps ); @@ -107,7 +109,7 @@ protected: TQProgressBar* mProgress; TQPushButton* mCancelButton; TQLabel* mItemLabel; - TQLabel* mItemStatus; + TQLabel* mItemtqStatus; TQFrame* mFrame; SSLLabel* mSSLLabel; ProgressItem* mItem; @@ -116,9 +118,10 @@ protected: class KDE_EXPORT ProgressDialog : public OverlayWidget { Q_OBJECT + TQ_OBJECT public: - ProgressDialog( TQWidget* alignWidget, TQWidget* parent, const char* name = 0 ); + ProgressDialog( TQWidget* alignWidget, TQWidget* tqparent, const char* name = 0 ); ~ProgressDialog(); void setVisible( bool b ); @@ -130,7 +133,7 @@ void slotTransactionAdded( KPIM::ProgressItem *item ); void slotTransactionCompleted( KPIM::ProgressItem *item ); void slotTransactionCanceled( KPIM::ProgressItem *item ); void slotTransactionProgress( KPIM::ProgressItem *item, unsigned int progress ); - void slotTransactionStatus( KPIM::ProgressItem *item, const TQString& ); + void slotTransactiontqStatus( KPIM::ProgressItem *item, const TQString& ); void slotTransactionLabel( KPIM::ProgressItem *item, const TQString& ); void slotTransactionUsesCrypto( KPIM::ProgressItem *item, bool ); void slotTransactionUsesBusyIndicator( KPIM::ProgressItem*, bool ); diff --git a/libkdepim/progressmanager.cpp b/libkdepim/progressmanager.cpp index 740e6c121..de305212d 100644 --- a/libkdepim/progressmanager.cpp +++ b/libkdepim/progressmanager.cpp @@ -35,10 +35,10 @@ KPIM::ProgressManager * KPIM::ProgressManager::mInstance = 0; unsigned int KPIM::ProgressManager::uID = 42; ProgressItem::ProgressItem( - ProgressItem* parent, const TQString& id, + ProgressItem* tqparent, const TQString& id, const TQString& label, const TQString& status, bool canBeCanceled, bool usesCrypto ) - :mId( id ), mLabel( label ), mStatus( status ), mParent( parent ), + :mId( id ), mLabel( label ), mtqStatus( status ), mParent( tqparent ), mCanBeCanceled( canBeCanceled ), mProgress( 0 ), mTotal( 0 ), mCompleted( 0 ), mWaitingForKids( false ), mCanceled( false ), mUsesCrypto( usesCrypto ), mUsesBusyIndicator( false ) @@ -56,8 +56,8 @@ void ProgressItem::setComplete() if ( !mCanceled ) setProgress( 100 ); emit progressItemCompleted( this ); - if ( parent() ) - parent()->removeChild( this ); + if ( tqparent() ) + tqparent()->removeChild( this ); deleteLater(); } else { mWaitingForKids = true; @@ -84,7 +84,7 @@ void ProgressItem::cancel() if ( mCanceled || !mCanBeCanceled ) return; kdDebug(5300) << "ProgressItem::cancel() - " << label() << endl; mCanceled = true; - // Cancel all children. + // Cancel all tqchildren. TQValueList<ProgressItem*> kids = mChildren.keys(); TQValueList<ProgressItem*>::Iterator it( kids.begin() ); TQValueList<ProgressItem*>::Iterator end( kids.end() ); @@ -93,7 +93,7 @@ void ProgressItem::cancel() if ( kid->canBeCanceled() ) kid->cancel(); } - seStatus( i18n( "Aborting..." ) ); + setqStatus( i18n( "Aborting..." ) ); emit progressItemCanceled( this ); } @@ -111,10 +111,10 @@ void ProgressItem::setLabel( const TQString& v ) emit progressItemLabel( this, mLabel ); } -void ProgressItem::seStatus( const TQString& v ) +void ProgressItem::setqStatus( const TQString& v ) { - mStatus = v; - emit progressItemStatus( this, mStatus ); + mtqStatus = v; + emit progressItemtqStatus( this, mtqStatus ); } void ProgressItem::setUsesCrypto( bool v ) @@ -147,16 +147,16 @@ ProgressManager* ProgressManager::instance() } ProgressItem* ProgressManager::createProgressItemImpl( - ProgressItem* parent, const TQString& id, + ProgressItem* tqparent, const TQString& id, const TQString &label, const TQString &status, bool cancellable, bool usesCrypto ) { ProgressItem *t = 0; if ( !mTransactions[ id ] ) { - t = new ProgressItem ( parent, id, label, status, cancellable, usesCrypto ); + t = new ProgressItem ( tqparent, id, label, status, cancellable, usesCrypto ); mTransactions.insert( id, t ); - if ( parent ) { - ProgressItem *p = mTransactions[ parent->id() ]; + if ( tqparent ) { + ProgressItem *p = mTransactions[ tqparent->id() ]; if ( p ) { p->addChild( t ); } @@ -170,8 +170,8 @@ ProgressItem* ProgressManager::createProgressItemImpl( this, TQT_SIGNAL( progressItemAdded(KPIM::ProgressItem*) ) ); connect ( t, TQT_SIGNAL( progressItemCanceled(KPIM::ProgressItem*) ), this, TQT_SIGNAL( progressItemCanceled(KPIM::ProgressItem*) ) ); - connect ( t, TQT_SIGNAL( progressItemStatus(KPIM::ProgressItem*, const TQString&) ), - this, TQT_SIGNAL( progressItemStatus(KPIM::ProgressItem*, const TQString&) ) ); + connect ( t, TQT_SIGNAL( progressItemtqStatus(KPIM::ProgressItem*, const TQString&) ), + this, TQT_SIGNAL( progressItemtqStatus(KPIM::ProgressItem*, const TQString&) ) ); connect ( t, TQT_SIGNAL( progressItemLabel(KPIM::ProgressItem*, const TQString&) ), this, TQT_SIGNAL( progressItemLabel(KPIM::ProgressItem*, const TQString&) ) ); connect ( t, TQT_SIGNAL( progressItemUsesCrypto(KPIM::ProgressItem*, bool) ), @@ -188,11 +188,11 @@ ProgressItem* ProgressManager::createProgressItemImpl( } ProgressItem* ProgressManager::createProgressItemImpl( - const TQString& parent, const TQString &id, + const TQString& tqparent, const TQString &id, const TQString &label, const TQString& status, bool canBeCanceled, bool usesCrypto ) { - ProgressItem * p = mTransactions[parent]; + ProgressItem * p = mTransactions[tqparent]; return createProgressItemImpl( p, id, label, status, canBeCanceled, usesCrypto ); } @@ -225,7 +225,7 @@ ProgressItem* ProgressManager::singleItem() const if ( (*it)->usesBusyIndicator() ) return 0; - if ( !(*it)->parent() ) { // if it's a top level one, only those count + if ( !(*it)->tqparent() ) { // if it's a top level one, only those count if ( item ) return 0; // we found more than one else diff --git a/libkdepim/progressmanager.h b/libkdepim/progressmanager.h index 47409002f..745e69a29 100644 --- a/libkdepim/progressmanager.h +++ b/libkdepim/progressmanager.h @@ -36,9 +36,10 @@ class ProgressItem; class ProgressManager; typedef TQMap<ProgressItem*, bool> ProgressItemMap; -class KDE_EXPORT ProgressItem : public QObject +class KDE_EXPORT ProgressItem : public TQObject { Q_OBJECT + TQ_OBJECT friend class ProgressManager; friend class TQDict< ProgressItem >; // so it can be deleted from dicts @@ -51,9 +52,9 @@ class KDE_EXPORT ProgressItem : public QObject const TQString& id() const { return mId; } /** - * @return The parent item of this one, if there is one. + * @return The tqparent item of this one, if there is one. */ - ProgressItem *parent() const { return mParent; } + ProgressItem *tqparent() const { return mParent; } /** * @return The user visible string to be used to represent this item. @@ -69,13 +70,13 @@ class KDE_EXPORT ProgressItem : public QObject /** * @return The string to be used for showing this item's current status. */ - const TQString& status() const { return mStatus; } + const TQString& status() const { return mtqStatus; } /** * Set the string to be used for showing this item's current status. * @p v will be interpreted as rich text, so it might have to be escaped. * @param v The status string. */ - void seStatus( const TQString& v ); + void setqStatus( const TQString& v ); /** * @return Whether this item can be cancelled. @@ -131,7 +132,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 ); seStatus( TQString::null ); mCompleted = 0; } + void reset() { setProgress( 0 ); setqStatus( TQString() ); mCompleted = 0; } void cancel(); @@ -188,7 +189,7 @@ signals: * @param The updated item. * @param The new message. */ - void progressItemStatus( KPIM::ProgressItem*, const TQString& ); + void progressItemtqStatus( KPIM::ProgressItem*, const TQString& ); /** * Emitted when the label of an item changed. Should be used by * progress dialogs to update the label of an item. @@ -216,7 +217,7 @@ signals: protected: /* Only to be used by our good friend the ProgressManager */ - ProgressItem( ProgressItem* parent, + ProgressItem( ProgressItem* tqparent, const TQString& id, const TQString& label, const TQString& status, @@ -228,7 +229,7 @@ signals: private: TQString mId; TQString mLabel; - TQString mStatus; + TQString mtqStatus; ProgressItem* mParent; bool mCanBeCanceled; unsigned int mProgress; @@ -259,13 +260,14 @@ signals: * one with that id, there will not be a new one created but the existing * one will be returned. This is convenient for accessing items that are * needed regularly without the to store a pointer to them or to add child - * items to parents by id. + * items to tqparents by id. */ -class KDE_EXPORT ProgressManager : public QObject +class KDE_EXPORT ProgressManager : public TQObject { Q_OBJECT + TQ_OBJECT public: virtual ~ProgressManager(); @@ -286,21 +288,21 @@ class KDE_EXPORT ProgressManager : public QObject /** * Creates a ProgressItem with a unique id and the given label. * This is the simplest way to aquire a progress item. It will not - * have a parent and will be set to be cancellable and not using crypto. + * have a tqparent and will be set to be cancellable and not using crypto. * * @param label The text to be displayed by progress handlers. It will be * interpreted as rich text, so it might have to be escaped. */ static ProgressItem * createProgressItem( const TQString &label ) { return instance()->createProgressItemImpl( 0, getUniqueID(), label, - TQString::null, true, false ); + TQString(), true, false ); } /** - * Creates a new progressItem with the given parent, id, label and initial + * Creates a new progressItem with the given tqparent, id, label and initial * status. * - * @param parent Specify an already existing item as the parent of this one. + * @param tqparent Specify an already existing item as the tqparent of this one. * @param id Used to identify this operation for cancel and progress info. * @param label The text to be displayed by progress handlers. It will be * interpreted as rich text, so it might have to be escaped. @@ -308,40 +310,40 @@ class KDE_EXPORT ProgressManager : public QObject * interpreted as rich text, so it might have to be escaped. * @param canBeCanceled can the user cancel this operation? * @param usesCrypto does the operation use secure transports (SSL) - * Cancelling the parent will cancel the children as well (if they can be - * cancelled) and ongoing children prevent parents from finishing. + * Cancelling the tqparent will cancel the tqchildren as well (if they can be + * cancelled) and ongoing tqchildren prevent tqparents from finishing. * @return The ProgressItem representing the operation. */ - static ProgressItem * createProgressItem( ProgressItem* parent, + static ProgressItem * createProgressItem( ProgressItem* tqparent, const TQString& id, const TQString& label, - const TQString& status = TQString::null, + const TQString& status = TQString(), bool canBeCanceled = true, bool usesCrypto = false ) { - return instance()->createProgressItemImpl( parent, id, label, status, + return instance()->createProgressItemImpl( tqparent, id, label, status, canBeCanceled, usesCrypto ); } /** - * Use this version if you have the id string of the parent and want to + * Use this version if you have the id string of the tqparent and want to * add a subjob to it. */ - static ProgressItem * createProgressItem( const TQString& parent, + static ProgressItem * createProgressItem( const TQString& tqparent, const TQString& id, const TQString& label, - const TQString& status = TQString::null, + const TQString& status = TQString(), bool canBeCanceled = true, bool usesCrypto = false ) { - return instance()->createProgressItemImpl( parent, id, label, + return instance()->createProgressItemImpl( tqparent, id, label, status, canBeCanceled, usesCrypto ); } /** - * Version without a parent. + * Version without a tqparent. */ static ProgressItem * createProgressItem( const TQString& id, const TQString& label, - const TQString& status = TQString::null, + const TQString& status = TQString(), bool canBeCanceled = true, bool usesCrypto = false ) { return instance()->createProgressItemImpl( 0, id, label, status, @@ -380,8 +382,8 @@ class KDE_EXPORT ProgressManager : public QObject void progressItemCompleted( KPIM::ProgressItem* ); /** @see ProgressItem::progressItemCanceled() */ void progressItemCanceled( KPIM::ProgressItem* ); - /** @see ProgressItem::progressItemStatus() */ - void progressItemStatus( KPIM::ProgressItem*, const TQString& ); + /** @see ProgressItem::progressItemtqStatus() */ + void progressItemtqStatus( KPIM::ProgressItem*, const TQString& ); /** @see ProgressItem::progressItemLabel() */ void progressItemLabel( KPIM::ProgressItem*, const TQString& ); /** @see ProgressItem::progressItemUsesCrypto() */ @@ -417,11 +419,11 @@ class KDE_EXPORT ProgressManager : public QObject ProgressManager( const ProgressManager& ); virtual ProgressItem* createProgressItemImpl( - ProgressItem* parent, const TQString& id, + ProgressItem* tqparent, const TQString& id, const TQString& label, const TQString& status, bool cancellable, bool usesCrypto ); virtual ProgressItem* createProgressItemImpl( - const TQString& parent, const TQString& id, + const TQString& tqparent, const TQString& id, const TQString& label, const TQString& status, bool cancellable, bool usesCrypto ); void emitShowProgressDialogImpl(); diff --git a/libkdepim/qutf7codec.cpp b/libkdepim/qutf7codec.cpp index bbee2d8ca..db6589cd9 100644 --- a/libkdepim/qutf7codec.cpp +++ b/libkdepim/qutf7codec.cpp @@ -15,7 +15,7 @@ 02110-1301, US As a special exception, permission is granted to use this plugin - with any version of Qt by TrollTech AS, Norway. In this case, the + with any version of TQt 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 tqinvalidate any other reasons why the @@ -25,33 +25,33 @@ #include "qutf7codec.h" -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC -int QUtf7Codec::mibEnum() const { +int TQUtf7Codec::mibEnum() const { return 1012; } -int QStrictUtf7Codec::mibEnum() const { +int TQStrictUtf7Codec::mibEnum() const { return -1012; } -const char* QUtf7Codec::name() const { +const char* TQUtf7Codec::name() const { return "UTF-7"; } -const char* QStrictUtf7Codec::name() const { +const char* TQStrictUtf7Codec::name() const { return "X-QT-UTF-7-STRICT"; } -const char* QUtf7Codec::mimeName() const { +const char* TQUtf7Codec::mimeName() const { return "UTF-7"; } -bool QUtf7Codec::canEncode( TQChar ) const { +bool TQUtf7Codec::canEncode( TQChar ) const { return TRUE; } -bool QUtf7Codec::canEncode( const TQString & ) const { +bool TQUtf7Codec::canEncode( const TQString & ) const { return TRUE; } @@ -87,7 +87,7 @@ static inline bool isOfSet(uchar ch, uchar* set) { return set[ ch/8 ] & (0x80 >> ( ch%8 )); } -int QUtf7Codec::heuristicContentMatch(const char* chars, int len) const +int TQUtf7Codec::heuristicContentMatch(const char* chars, int len) const { int stepNo = 0; int i; @@ -136,7 +136,7 @@ int QUtf7Codec::heuristicContentMatch(const char* chars, int len) const return i; } -class QUtf7Decoder : public TQTextDecoder { +class TQUtf7Decoder : public TQTextDecoder { // the storage for our tqunicode char until it's finished ushort uc; // the state of the base64 decoding @@ -156,7 +156,7 @@ class QUtf7Decoder : public TQTextDecoder { // of a shifted-sequence. bool rightAfterEscape; public: - QUtf7Decoder() : uc(0), stepNo(0), shifted(FALSE), rightAfterEscape(FALSE) + TQUtf7Decoder() : uc(0), stepNo(0), shifted(FALSE), rightAfterEscape(FALSE) { } @@ -180,10 +180,10 @@ public: // check for 8bit char's: // if ( ch > 127 ) { - qWarning("QUtf7Decoder: 8bit char found in input. " + qWarning("TQUtf7Decoder: 8bit char found in input. " "Parser has been re-initialized!"); resetParser(); - result += TQChar::tqreplacement; + result += TQChar::replacement; continue; } @@ -228,12 +228,12 @@ public: // makes for an ill-formed sequence. // Note that we catch (the valid) "+-" pair // right at the beginning. - qWarning("QUtf7Decoder: ill-formed input: " + qWarning("TQUtf7Decoder: ill-formed input: " "non-base64 char after escaping \"+\"!"); } // pending bits from base64 encoding must be all 0: if (stepNo >= 1 && uc) { - qWarning("QUtf7Decoder: ill-formed sequence: " + qWarning("TQUtf7Decoder: ill-formed sequence: " "non-zero bits in shifted-sequence tail!"); } resetParser(); @@ -310,22 +310,22 @@ public: } // toUnicode() -}; // class QUtf7Decoder +}; // class TQUtf7Decoder -TQTextDecoder* QUtf7Codec::makeDecoder() const +TQTextDecoder* TQUtf7Codec::makeDecoder() const { - return new QUtf7Decoder; + return new TQUtf7Decoder; } -class QUtf7Encoder : public TQTextEncoder { +class TQUtf7Encoder : public TQTextEncoder { uchar dontNeedEncodingSet[16]; ushort outbits; uint stepNo : 2; bool shifted : 1; bool mayContinueShiftedSequence : 1; public: - QUtf7Encoder(bool encOpt, bool encLwsp) + TQUtf7Encoder(bool encOpt, bool encLwsp) : outbits(0), stepNo(0), shifted(FALSE), mayContinueShiftedSequence(FALSE) { @@ -537,14 +537,14 @@ public: return result; } // fromUnicode() -}; // class QUtf7Encoder +}; // class TQUtf7Encoder -TQTextEncoder* QUtf7Codec::makeEncoder() const { - return new QUtf7Encoder( false, false ); +TQTextEncoder* TQUtf7Codec::makeEncoder() const { + return new TQUtf7Encoder( false, false ); } -TQTextEncoder* QStrictUtf7Codec::makeEncoder() const { - return new QUtf7Encoder( true, false ); +TQTextEncoder* TQStrictUtf7Codec::makeEncoder() const { + return new TQUtf7Encoder( true, false ); } -#endif // QT_NO_TEXTCODEC +#endif // TQT_NO_TEXTCODEC diff --git a/libkdepim/qutf7codec.h b/libkdepim/qutf7codec.h index 116fa02ad..6bb5117ec 100644 --- a/libkdepim/qutf7codec.h +++ b/libkdepim/qutf7codec.h @@ -15,23 +15,21 @@ 02110-1301, US As a special exception, permission is granted to use this plugin - with any version of Qt by TrollTech AS, Norway. In this case, the + with any version of TQt 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 tqinvalidate any other reasons why the executable file might be covered by the GNU General Public License. */ -#ifndef QUTF7CODEC_H -#define QUTF7CODEC_H +#ifndef TQUTF7CODEC_H +#define TQUTF7CODEC_H -#ifndef QT_H #include "tqtextcodec.h" -#endif #include <kdepimmacros.h> -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC /** @short A TQTextCodec for the UTF-7 transformation of Unicode. @@ -47,10 +45,10 @@ @author Marc Mutz <mutz@kde.org> */ -class KDE_EXPORT QUtf7Codec : public TQTextCodec { +class KDE_EXPORT TQUtf7Codec : public TQTextCodec { bool encOpt, encLwsp; public: - QUtf7Codec() : TQTextCodec() {} + TQUtf7Codec() : TQTextCodec() {} int mibEnum() const; const char* name() const; @@ -65,14 +63,14 @@ public: int heuristicContentMatch( const char* chars, int len ) const; }; -/** This is a version of @ref QUtf7Codec, which should only be used in - MIME transfer. It differs from @ref QUtf7Codec only in that the +/** This is a version of @ref TQUtf7Codec, which should only be used in + MIME transfer. It differs from @ref TQUtf7Codec only in that the encoder escapes additional characters (the RFC2152 "optional direct set"), which might not be allowed in RFC822/RFC2047 header fields. You should only use this codec for @em encoding, since it's output - is pure UTF-7 and can equally well be decoded by @ref QUtf7Codec's + is pure UTF-7 and can equally well be decoded by @ref TQUtf7Codec's decoder. To distinguish between the two variants, this class has MIB enum @@ -80,12 +78,12 @@ public: "X-QT-UTF-7-STRICT". The MIME preferred charset name is still "UTF-7", though. - @short A variant of @ref QUtf7Codec, which protectes certain + @short A variant of @ref TQUtf7Codec, which protectes certain characters in MIME transport @author Marc Mutz <mutz@kde.org> */ -class KDE_EXPORT QStrictUtf7Codec : public QUtf7Codec { +class KDE_EXPORT TQStrictUtf7Codec : public TQUtf7Codec { public: - QStrictUtf7Codec() : QUtf7Codec() {} + TQStrictUtf7Codec() : TQUtf7Codec() {} const char* name() const; int mibEnum() const; @@ -93,6 +91,6 @@ public: TQTextEncoder* makeEncoder() const; }; -#endif // QT_NO_TEXTCODEC +#endif // TQT_NO_TEXTCODEC -#endif // QUTF7CODEC_H +#endif // TQUTF7CODEC_H diff --git a/libkdepim/qutf7codecplugin.cpp b/libkdepim/qutf7codecplugin.cpp index 27b706820..49eb92c8f 100644 --- a/libkdepim/qutf7codecplugin.cpp +++ b/libkdepim/qutf7codecplugin.cpp @@ -15,7 +15,7 @@ 02110-1301, US As a special exception, permission is granted to use this plugin - with any version of Qt by TrollTech AS, Norway. In this case, the + with any version of TQt 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 tqinvalidate any other reasons why the @@ -33,9 +33,9 @@ class TQTextCodec; // ######### This file isn't compiled currently -class QUtf7CodecPlugin : public TQTextCodecPlugin { +class TQUtf7CodecPlugin : public TQTextCodecPlugin { public: - QUtf7CodecPlugin() {} + TQUtf7CodecPlugin() {} TQStringList names() const { return TQStringList() << "UTF-7" << "X-QT-UTF-7-STRICT"; } TQValueList<int> mibEnums() const { return TQValueList<int>() << 1012 << -1012; } @@ -43,20 +43,20 @@ public: TQTextCodec * createForName( const TQString & ); }; -TQTextCodec * QUtf7CodecPlugin::createForMib( int mib ) { +TQTextCodec * TQUtf7CodecPlugin::createForMib( int mib ) { if ( mib == 1012 ) - return new QUtf7Codec(); + return new TQUtf7Codec(); else if ( mib == -1012 ) - return new QStrictUtf7Codec(); + return new TQStrictUtf7Codec(); return 0; } -TQTextCodec * QUtf7CodecPlugin::createForName( const TQString & name ) { +TQTextCodec * TQUtf7CodecPlugin::createForName( const TQString & name ) { if ( name == "UTF-7" ) - return new QUtf7Codec(); + return new TQUtf7Codec(); else if ( name == "X-QT-UTF-7-STRICT" ) - return new QStrictUtf7Codec(); + return new TQStrictUtf7Codec(); return 0; } -KDE_Q_EXPORT_PLUGIN( QUtf7CodecPlugin ); +KDE_TQ_EXPORT_PLUGIN( TQUtf7CodecPlugin ); diff --git a/libkdepim/recentaddresses.cpp b/libkdepim/recentaddresses.cpp index 80fe39123..6e1054d1d 100644 --- a/libkdepim/recentaddresses.cpp +++ b/libkdepim/recentaddresses.cpp @@ -18,11 +18,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -157,9 +157,9 @@ TQStringList RecentAddresses::addresses() const return addresses; } -RecentAddressDialog::RecentAddressDialog( TQWidget *parent, const char *name ) +RecentAddressDialog::RecentAddressDialog( TQWidget *tqparent, const char *name ) : KDialogBase( Plain, i18n( "Edit Recent Addresses" ), Ok | Cancel, Ok, - parent, name, true ) + tqparent, name, true ) { TQWidget *page = plainPage(); TQVBoxLayout *tqlayout = new TQVBoxLayout( page, 0, spacingHint() ); diff --git a/libkdepim/recentaddresses.h b/libkdepim/recentaddresses.h index 03254031b..f7ec276ec 100644 --- a/libkdepim/recentaddresses.h +++ b/libkdepim/recentaddresses.h @@ -18,11 +18,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -44,7 +44,7 @@ namespace KRecentAddress { class KDE_EXPORT RecentAddressDialog : public KDialogBase { public: - RecentAddressDialog( TQWidget *parent, const char *name = 0 ); + RecentAddressDialog( TQWidget *tqparent, const char *name = 0 ); void setAddresses( const TQStringList &addrs ); TQStringList addresses() const; private: diff --git a/libkdepim/resourceabc.cpp b/libkdepim/resourceabc.cpp index 794862e47..002f14987 100644 --- a/libkdepim/resourceabc.cpp +++ b/libkdepim/resourceabc.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "resourceabc.h" diff --git a/libkdepim/resourceabc.h b/libkdepim/resourceabc.h index 90abbf72b..f1509e443 100644 --- a/libkdepim/resourceabc.h +++ b/libkdepim/resourceabc.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef RESOURCEABC_H @@ -44,6 +44,7 @@ namespace KPIM { class KDE_EXPORT ResourceABC : public KABC::Resource { Q_OBJECT + TQ_OBJECT public: ResourceABC( const KConfig* ); diff --git a/libkdepim/sendsmsdialog.cpp b/libkdepim/sendsmsdialog.cpp index 7011c7129..6a1e35417 100644 --- a/libkdepim/sendsmsdialog.cpp +++ b/libkdepim/sendsmsdialog.cpp @@ -27,8 +27,8 @@ #include "sendsmsdialog.h" -SendSMSDialog::SendSMSDialog( const TQString &recipientName, TQWidget *parent, const char *name ) - : KDialogBase( Plain, i18n( "Send SMS" ), Ok | Cancel, Ok, parent, name, true, true ) +SendSMSDialog::SendSMSDialog( const TQString &recipientName, TQWidget *tqparent, const char *name ) + : KDialogBase( Plain, i18n( "Send SMS" ), Ok | Cancel, Ok, tqparent, name, true, true ) { TQWidget *page = plainPage(); @@ -37,7 +37,7 @@ SendSMSDialog::SendSMSDialog( const TQString &recipientName, TQWidget *parent, c tqlayout->addWidget( new TQLabel( i18n( "Message" ), page ), 0, 0 ); mMessageLength = new TQLabel( "0/160", page ); - mMessageLength->tqsetAlignment( Qt::AlignRight ); + mMessageLength->tqsetAlignment( TQt::AlignRight ); tqlayout->addWidget( mMessageLength, 0, 2 ); mText = new TQTextEdit( page ); diff --git a/libkdepim/sendsmsdialog.h b/libkdepim/sendsmsdialog.h index bd5b0ea92..43bfe72e8 100644 --- a/libkdepim/sendsmsdialog.h +++ b/libkdepim/sendsmsdialog.h @@ -30,9 +30,10 @@ class TQTextEdit; class SendSMSDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - SendSMSDialog( const TQString &recipientName, TQWidget *parent, const char *name = 0 ); + SendSMSDialog( const TQString &recipientName, TQWidget *tqparent, const char *name = 0 ); TQString text() const; diff --git a/libkdepim/sidebarextension.cpp b/libkdepim/sidebarextension.cpp index dc3413ebc..1ce8e9a8e 100644 --- a/libkdepim/sidebarextension.cpp +++ b/libkdepim/sidebarextension.cpp @@ -26,8 +26,8 @@ using namespace KParts; -SideBarExtension::SideBarExtension(TQWidget *exported, KParts::ReadOnlyPart *parent, const char* name) -: TQObject(parent, name), m_exported(exported), d(0) +SideBarExtension::SideBarExtension(TQWidget *exported, KParts::ReadOnlyPart *tqparent, const char* name) +: TQObject(tqparent, name), m_exported(exported), d(0) { } diff --git a/libkdepim/sidebarextension.h b/libkdepim/sidebarextension.h index 3a7ffbe5d..98b185c17 100644 --- a/libkdepim/sidebarextension.h +++ b/libkdepim/sidebarextension.h @@ -35,9 +35,10 @@ namespace KParts * Provides a way to export a widget which will be displayed in Kontacts * stackview at the left **/ - class KDE_EXPORT SideBarExtension : public QObject + class KDE_EXPORT SideBarExtension : public TQObject { Q_OBJECT + TQ_OBJECT public: /** @@ -45,10 +46,10 @@ namespace KParts * * @param exported A TQWidget derived widget that will be provided for the * users of SideBarExtension. - * @param parent The parent widget. + * @param tqparent The tqparent widget. * @param name The name of the class. **/ - SideBarExtension(TQWidget *exported, KParts::ReadOnlyPart *parent, const char* name); + SideBarExtension(TQWidget *exported, KParts::ReadOnlyPart *tqparent, const char* name); ~SideBarExtension(); /** diff --git a/libkdepim/spellingfilter.cpp b/libkdepim/spellingfilter.cpp index e57745e50..a08610983 100644 --- a/libkdepim/spellingfilter.cpp +++ b/libkdepim/spellingfilter.cpp @@ -156,7 +156,7 @@ void SpellingFilter::TextCensor::censorString(const TQString& s) while(mPos != -1) { // Find start of string - mPos = mText.find(s, mPos); + mPos = mText.tqfind(s, mPos); if(mPos != -1) { // Replace string with spaces @@ -187,7 +187,7 @@ bool SpellingFilter::TextCensor::atLineStart() const void SpellingFilter::TextCensor::skipLine() { - mPos = mText.find('\n', mPos); + mPos = mText.tqfind('\n', mPos); if(mPos == -1) mPos = static_cast<int>(mText.length()); else diff --git a/libkdepim/ssllabel.cpp b/libkdepim/ssllabel.cpp index 3ad982390..1349d4e80 100644 --- a/libkdepim/ssllabel.cpp +++ b/libkdepim/ssllabel.cpp @@ -19,11 +19,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -41,8 +41,8 @@ namespace KPIM { -SSLLabel::SSLLabel( TQWidget* parent ) - : TQLabel( parent ) +SSLLabel::SSLLabel( TQWidget* tqparent ) + : TQLabel( tqparent ) { setState( Done ); } diff --git a/libkdepim/ssllabel.h b/libkdepim/ssllabel.h index 06a638606..81f1d2273 100644 --- a/libkdepim/ssllabel.h +++ b/libkdepim/ssllabel.h @@ -19,11 +19,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -36,7 +36,7 @@ namespace KPIM { - class SSLLabel : public QLabel + class SSLLabel : public TQLabel { public: enum State { @@ -45,7 +45,7 @@ namespace KPIM { Clean, Done }; - SSLLabel( TQWidget* parent ); + SSLLabel( TQWidget* tqparent ); void setEncrypted( bool enc=true ); void setState( State state ); diff --git a/libkdepim/statusbarprogresswidget.cpp b/libkdepim/statusbarprogresswidget.cpp index 166376638..8ca46ff9b 100644 --- a/libkdepim/statusbarprogresswidget.cpp +++ b/libkdepim/statusbarprogresswidget.cpp @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -58,8 +58,8 @@ using KPIM::ProgressManager; using namespace KPIM; //----------------------------------------------------------------------------- -StatusbarProgressWidget::StatusbarProgressWidget( ProgressDialog* progressDialog, TQWidget* parent, bool button ) - : TQFrame( parent ), mCurrentItem( 0 ), mProgressDialog( progressDialog ), +StatusbarProgressWidget::StatusbarProgressWidget( ProgressDialog* progressDialog, TQWidget* tqparent, bool button ) + : TQFrame( tqparent ), mCurrentItem( 0 ), mProgressDialog( progressDialog ), mDelayTimer( 0 ), mBusyTimer( 0 ) { m_bShowButton = button; @@ -87,7 +87,7 @@ StatusbarProgressWidget::StatusbarProgressWidget( ProgressDialog* progressDialog m_pProgressBar->setMinimumWidth( w ); stack->addWidget( m_pProgressBar, 1 ); - m_pLabel = new TQLabel( TQString::null, this ); + m_pLabel = new TQLabel( TQString(), this ); m_pLabel->tqsetAlignment( AlignHCenter | AlignVCenter ); m_pLabel->installEventFilter( this ); m_pLabel->setMinimumWidth( w ); @@ -141,7 +141,7 @@ void StatusbarProgressWidget::updateBusyMode() void StatusbarProgressWidget::slotProgressItemAdded( ProgressItem *item ) { - if ( item->parent() ) + if ( item->tqparent() ) return; // we are only interested in top level items updateBusyMode(); @@ -149,7 +149,7 @@ void StatusbarProgressWidget::slotProgressItemAdded( ProgressItem *item ) void StatusbarProgressWidget::slotProgressItemCompleted( ProgressItem *item ) { - if ( item->parent() ) return; // we are only interested in top level items + if ( item->tqparent() ) return; // we are only interested in top level items connectSingleItem(); // if going back to 1 item if ( ProgressManager::instance()->isEmpty() ) { // No item // Done. In 5s the progress-widget will close, then we can clean up the statusbar diff --git a/libkdepim/statusbarprogresswidget.h b/libkdepim/statusbarprogresswidget.h index a35943013..3a4734952 100644 --- a/libkdepim/statusbarprogresswidget.h +++ b/libkdepim/statusbarprogresswidget.h @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -54,10 +54,11 @@ class ProgressDialog; class KDE_EXPORT StatusbarProgressWidget : public TQFrame { Q_OBJECT + TQ_OBJECT public: - StatusbarProgressWidget( ProgressDialog* progressDialog, TQWidget* parent, bool button = true ); + StatusbarProgressWidget( ProgressDialog* progressDialog, TQWidget* tqparent, bool button = true ); public slots: diff --git a/libkdepim/tests/testdateedit.cpp b/libkdepim/tests/testdateedit.cpp index e0d1d732d..6b4ef3392 100644 --- a/libkdepim/tests/testdateedit.cpp +++ b/libkdepim/tests/testdateedit.cpp @@ -31,8 +31,8 @@ #include "testdateedit.h" -DateEdit::DateEdit( TQWidget *parent, const char *name ) - : TQWidget( parent, name ) +DateEdit::DateEdit( TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ) { TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); diff --git a/libkdepim/tests/testdateedit.h b/libkdepim/tests/testdateedit.h index 86a9ea4e8..44cb214a4 100644 --- a/libkdepim/tests/testdateedit.h +++ b/libkdepim/tests/testdateedit.h @@ -24,12 +24,13 @@ #include <tqwidget.h> -class DateEdit : public QWidget +class DateEdit : public TQWidget { Q_OBJECT + TQ_OBJECT public: - DateEdit( TQWidget *parent = 0, const char *name = 0 ); + DateEdit( TQWidget *tqparent = 0, const char *name = 0 ); public slots: void dateChanged( const TQDate& ); diff --git a/libkdepim/tests/testdistrlist.cpp b/libkdepim/tests/testdistrlist.cpp index b446a5a39..f588f9a93 100644 --- a/libkdepim/tests/testdistrlist.cpp +++ b/libkdepim/tests/testdistrlist.cpp @@ -97,9 +97,9 @@ void TestDistrList::runAll() bool TestDistrList::check(const TQString& txt, TQString a, TQString b) { if (a.isEmpty()) - a = TQString::null; + a = TQString(); if (b.isEmpty()) - b = TQString::null; + b = TQString(); if (a == b) { kdDebug() << txt << " : checking '" << a << "' against expected value '" << b << "'... " << "ok" << endl; } @@ -123,8 +123,8 @@ static bool removeDirAndContentsRecursively( const TQString & path ) d.setPath( path ); d.setFilter( TQDir::Files | TQDir::Dirs | TQDir::Hidden ); - const QFileInfoList *list = d.entryInfoList(); - QFileInfoListIterator it( *list ); + const TQFileInfoList *list = d.entryInfoList(); + TQFileInfoListIterator it( *list ); TQFileInfo *fi; while ( (fi = it.current()) != 0 ) { @@ -227,7 +227,7 @@ void TestDistrList::testInsertEntry() DistributionList::Entry::List entries = dl.entries( ab ); check( "entries count", TQString::number( entries.count() ), "3" ); check( "first entry", entries[0].addressee.name(), "addr1" ); - check( "first entry", entries[0].email, TQString::null ); + check( "first entry", entries[0].email, TQString() ); check( "second entry", entries[1].addressee.name(), "addr2" ); check( "second entry", entries[1].email, "addr2-alternate@kde.org" ); check( "third entry", entries[2].addressee.name(), "addr2" ); diff --git a/libkdepim/tests/testdistrlist.h b/libkdepim/tests/testdistrlist.h index 782c3ec5f..3f64527e6 100644 --- a/libkdepim/tests/testdistrlist.h +++ b/libkdepim/tests/testdistrlist.h @@ -21,9 +21,10 @@ #include <tqobject.h> -class TestDistrList : public QObject +class TestDistrList : public TQObject { Q_OBJECT + TQ_OBJECT public: TestDistrList() {} diff --git a/libkdepim/tests/testutf7decoder.cpp b/libkdepim/tests/testutf7decoder.cpp index f6b8f4ada..b13fb30c3 100644 --- a/libkdepim/tests/testutf7decoder.cpp +++ b/libkdepim/tests/testutf7decoder.cpp @@ -6,7 +6,7 @@ int main( int argc, char * argv[] ) { if ( argc == 1 ) { - (void)new QUtf7Codec; + (void)new TQUtf7Codec; TQTextCodec * codec = TQTextCodec::codecForName("utf-7"); assert(codec); diff --git a/libkdepim/tests/testutf7encoder.cpp b/libkdepim/tests/testutf7encoder.cpp index 04ed8f702..2938cd660 100644 --- a/libkdepim/tests/testutf7encoder.cpp +++ b/libkdepim/tests/testutf7encoder.cpp @@ -5,7 +5,7 @@ void main( int argc, char * argv[] ) { if ( argc == 2 ) { - QUtf7Codec * codec = new QUtf7Codec; + TQUtf7Codec * codec = new TQUtf7Codec; TQTextEncoder * enc; diff --git a/libkdepim/tests/testutf7encoder2.cpp b/libkdepim/tests/testutf7encoder2.cpp index 6d67bae0a..65cf8b461 100644 --- a/libkdepim/tests/testutf7encoder2.cpp +++ b/libkdepim/tests/testutf7encoder2.cpp @@ -7,7 +7,7 @@ int main( int argc, char * argv[] ) { if ( argc == 1 ) { - (void)new QUtf7Codec; + (void)new TQUtf7Codec; TQTextCodec * codec = TQTextCodec::codecForName("utf-7"); assert(codec); diff --git a/libkdepim/weaver.cpp b/libkdepim/weaver.cpp index 36bb8fe00..0e718e019 100644 --- a/libkdepim/weaver.cpp +++ b/libkdepim/weaver.cpp @@ -8,7 +8,7 @@ http://www.kde.org http://www.hackerbuero.org $ $ License: LGPL with the following explicit clarification: - This code may be linked against any version of the Qt toolkit + This code may be linked against any version of the TQt toolkit from Troll Tech, Norway. $ */ @@ -28,8 +28,8 @@ namespace ThreadWeaver { bool Debug = true; int DebugLevel = 2; - Job::Job (TQObject* parent, const char* name) - : TQObject (parent, name), + Job::Job (TQObject* tqparent, const char* name) + : TQObject (tqparent, name), m_finished (false), m_mutex (new TQMutex (true) ), m_thread (0) @@ -178,9 +178,9 @@ namespace ThreadWeaver { unsigned int Thread::sm_Id; - Thread::Thread (Weaver *parent) + Thread::Thread (Weaver *tqparent) : TQThread (), - m_parent ( parent ), + m_tqparent ( tqparent ), m_id ( makeId() ) { } @@ -212,7 +212,7 @@ namespace ThreadWeaver { { debug ( 3, "Thread::run [%u]: trying to execute the next job.\n", id() ); - job = m_parent->applyForWork ( this, job ); + job = m_tqparent->applyForWork ( this, job ); if (job == 0) { @@ -229,7 +229,7 @@ namespace ThreadWeaver { void Thread::post (Event::Action a, Job *j) { - m_parent->post ( a, this, j); + m_tqparent->post ( a, this, j); } void Thread::msleep(unsigned long msec) @@ -237,9 +237,9 @@ namespace ThreadWeaver { TQThread::msleep(msec); } - Weaver::Weaver(TQObject* parent, const char* name, + Weaver::Weaver(TQObject* tqparent, const char* name, int inventoryMin, int inventoryMax) - : TQObject(parent, name), + : TQObject(tqparent, name), m_active(0), m_inventoryMin(inventoryMin), m_inventoryMax(inventoryMax), @@ -437,7 +437,7 @@ namespace ThreadWeaver { } return true; } else { - // others - please make sure we are a QObject! + // others - please make sure we are a TQObject! return TQObject::event ( e ); } } diff --git a/libkdepim/weaver.h b/libkdepim/weaver.h index 929714dfb..43d4368d0 100644 --- a/libkdepim/weaver.h +++ b/libkdepim/weaver.h @@ -8,7 +8,7 @@ http://www.kde.org http://www.hackerbuero.org $ $ License: LGPL with the following explicit clarification: - This code may be linked against any version of the Qt toolkit + This code may be linked against any version of the TQt toolkit from Troll Tech, Norway. $ */ @@ -97,7 +97,7 @@ namespace ThreadWeaver { Note: Do not create and use SPR/APR events, use Job::triggerSPR or Job::triggerAPR to create the requests. */ - class KDE_EXPORT Event : public QCustomEvent + class KDE_EXPORT Event : public TQCustomEvent { public: enum Action { @@ -161,12 +161,13 @@ namespace ThreadWeaver { Note: When using an APR, you better make sure to receive the signal with some object, otherwise the calling thread will block forever! */ - class KDE_EXPORT Job : public QObject + class KDE_EXPORT Job : public TQObject { Q_OBJECT + TQ_OBJECT public: /** Construct a Job object. */ - Job(TQObject* parent=0, const char* name=0); + Job(TQObject* tqparent=0, const char* name=0); /** Destructor. */ virtual ~Job(); @@ -246,13 +247,13 @@ namespace ThreadWeaver { /** The class Thread is used to represent the worker threads in the weaver's inventory. It is not meant to be overloaded. */ - class KDE_EXPORT Thread : public QThread + class KDE_EXPORT Thread : public TQThread { public: /** Create a thread. - These thread objects are only used inside the Weaver parent + These thread objects are only used inside the Weaver tqparent object. */ - Thread(Weaver *parent); + Thread(Weaver *tqparent); /** The destructor. */ ~Thread(); @@ -260,7 +261,7 @@ namespace ThreadWeaver { /** Overloaded to execute the assigned job. This will NOT return until shutdown() is called. The thread will try to execute one job after the other, asking - the Weaver parent for a new job when the assigned one is + the Weaver tqparent for a new job when the assigned one is finished. If no jobs are available, the thread will suspend. After shutdown() is called, the thread will end as soon as @@ -282,7 +283,7 @@ namespace ThreadWeaver { void post (Event::Action, Job* = 0); private: - Weaver *m_parent; + Weaver *m_tqparent; const unsigned int m_id; @@ -293,11 +294,12 @@ namespace ThreadWeaver { /** A weaver is the manager of worker threads (Thread objects) to which it assigns jobs from it's queue. */ - class KDE_EXPORT Weaver : public QObject + class KDE_EXPORT Weaver : public TQObject { Q_OBJECT + TQ_OBJECT public: - Weaver (TQObject* parent=0, const char* name=0, + Weaver (TQObject* tqparent=0, const char* name=0, int inventoryMin = 4, // minimal number of provided threads int inventoryMax = 32); // maximum number of provided threads virtual ~Weaver (); diff --git a/libkdepim/weaverextensions.cpp b/libkdepim/weaverextensions.cpp index cb8fe48f2..e0cdfb381 100644 --- a/libkdepim/weaverextensions.cpp +++ b/libkdepim/weaverextensions.cpp @@ -8,7 +8,7 @@ http://www.kde.org http://www.hackerbuero.org $ $ License: LGPL with the following explicit clarification: - This code may be linked against any version of the Qt toolkit + This code may be linked against any version of the TQt toolkit from Troll Tech, Norway. $ */ @@ -19,8 +19,8 @@ namespace KPIM { namespace ThreadWeaver { - WeaverExtension::WeaverExtension ( TQObject *parent, const char *name) - : TQObject (parent, name) + WeaverExtension::WeaverExtension ( TQObject *tqparent, const char *name) + : TQObject (tqparent, name) { } diff --git a/libkdepim/weaverextensions.h b/libkdepim/weaverextensions.h index f737f8a6d..53eff64cb 100644 --- a/libkdepim/weaverextensions.h +++ b/libkdepim/weaverextensions.h @@ -8,7 +8,7 @@ http://www.kde.org http://www.hackerbuero.org $ $ License: LGPL with the following explicit clarification: - This code may be linked against any version of the Qt toolkit + This code may be linked against any version of the TQt toolkit from Troll Tech, Norway. $ */ @@ -30,11 +30,12 @@ namespace ThreadWeaver { thread. It can be used to monitor the state of a program, but also, for example, to provide visualization of the Weaver's work load in GUI programs. Derive from it to actually create an extension. */ - class WeaverExtension : public QObject + class WeaverExtension : public TQObject { Q_OBJECT + TQ_OBJECT public: - WeaverExtension ( TQObject *parent = 0, const char *name = 0); + WeaverExtension ( TQObject *tqparent = 0, const char *name = 0); /** Attach() is a convenience method that will connect all our slots to signals emitted by the weaver. It is also possible to avoid attach() and only connect necessary signals. */ diff --git a/libkdepim/weaverlogger.cpp b/libkdepim/weaverlogger.cpp index a91d505e3..14b3c5051 100644 --- a/libkdepim/weaverlogger.cpp +++ b/libkdepim/weaverlogger.cpp @@ -8,7 +8,7 @@ http://www.kde.org http://www.hackerbuero.org $ $ License: LGPL with the following explicit clarification: - This code may be linked against any version of the Qt toolkit + This code may be linked against any version of the TQt toolkit from Troll Tech, Norway. $ */ @@ -21,8 +21,8 @@ namespace ThreadWeaver { extern void debug(int severity, const char * cformat, ...); - WeaverThreadLogger::WeaverThreadLogger( TQObject *parent, const char *name) - : WeaverExtension (parent, name) + WeaverThreadLogger::WeaverThreadLogger( TQObject *tqparent, const char *name) + : WeaverExtension (tqparent, name) { } diff --git a/libkdepim/weaverlogger.h b/libkdepim/weaverlogger.h index c0d001b99..ece3ddea1 100644 --- a/libkdepim/weaverlogger.h +++ b/libkdepim/weaverlogger.h @@ -8,7 +8,7 @@ http://www.kde.org http://www.hackerbuero.org $ $ License: LGPL with the following explicit clarification: - This code may be linked against any version of the Qt toolkit + This code may be linked against any version of the TQt toolkit from Troll Tech, Norway. $ */ @@ -26,8 +26,9 @@ namespace ThreadWeaver { class WeaverThreadLogger : public WeaverExtension { Q_OBJECT + TQ_OBJECT public: - WeaverThreadLogger( TQObject *parent = 0, const char *name = 0); + WeaverThreadLogger( TQObject *tqparent = 0, const char *name = 0); ~WeaverThreadLogger(); void threadCreated (Thread *); void threadDestroyed (Thread *); |