diff options
Diffstat (limited to 'kresources/lib')
-rw-r--r-- | kresources/lib/addressbookadaptor.cpp | 4 | ||||
-rw-r--r-- | kresources/lib/folderconfig.cpp | 12 | ||||
-rw-r--r-- | kresources/lib/folderlister.cpp | 10 | ||||
-rw-r--r-- | kresources/lib/folderlistview.cpp | 36 | ||||
-rw-r--r-- | kresources/lib/folderlistview.h | 6 | ||||
-rw-r--r-- | kresources/lib/folderselectdialog.cpp | 8 | ||||
-rw-r--r-- | kresources/lib/groupwaredataadaptor.cpp | 6 | ||||
-rw-r--r-- | kresources/lib/groupwaredataadaptor.h | 2 | ||||
-rw-r--r-- | kresources/lib/groupwaredownloadjob.cpp | 18 | ||||
-rw-r--r-- | kresources/lib/kcal_resourcegroupwarebase.cpp | 6 |
10 files changed, 54 insertions, 54 deletions
diff --git a/kresources/lib/addressbookadaptor.cpp b/kresources/lib/addressbookadaptor.cpp index 80da39421..65ca96290 100644 --- a/kresources/lib/addressbookadaptor.cpp +++ b/kresources/lib/addressbookadaptor.cpp @@ -62,7 +62,7 @@ TQString AddressBookAdaptor::mimeType() const bool AddressBookAdaptor::localItemExists( const TQString &localId ) { - KABC::Addressee a = mResource->findByUid( localId ); + KABC::Addressee a = mResource->tqfindByUid( localId ); return !a.isEmpty(); } @@ -85,7 +85,7 @@ bool AddressBookAdaptor::localItemHasChanged( const TQString &localId ) void AddressBookAdaptor::deleteItem( const TQString &localId ) { - KABC::Addressee a = mResource->findByUid( localId ); + KABC::Addressee a = mResource->tqfindByUid( localId ); if ( !a.isEmpty() ) { mResource->removeAddressee( a ); mResource->clearChange( a.uid() ); diff --git a/kresources/lib/folderconfig.cpp b/kresources/lib/folderconfig.cpp index 25fd7d826..0a530361f 100644 --- a/kresources/lib/folderconfig.cpp +++ b/kresources/lib/folderconfig.cpp @@ -73,12 +73,12 @@ void FolderConfig::setFolderLister( FolderLister *f ) TQValueList<FolderListView::Property> types; TQValueList<FolderLister::ContentType> suptypes( mFolderLister->supportedTypes() ); - if ( suptypes.contains( FolderLister::Event ) ) types << FolderListView::Event; - if ( suptypes.contains( FolderLister::Todo ) ) types << FolderListView::Todo; - if ( suptypes.contains( FolderLister::Journal ) ) types << FolderListView::Journal; - if ( suptypes.contains( FolderLister::Contact ) ) types << FolderListView::Contact; - if ( suptypes.contains( FolderLister::All ) ) types << FolderListView::All; - if ( suptypes.contains( FolderLister::Unknown ) ) types << FolderListView::Unknown; + if ( suptypes.tqcontains( FolderLister::Event ) ) types << FolderListView::Event; + if ( suptypes.tqcontains( FolderLister::Todo ) ) types << FolderListView::Todo; + if ( suptypes.tqcontains( FolderLister::Journal ) ) types << FolderListView::Journal; + if ( suptypes.tqcontains( FolderLister::Contact ) ) types << FolderListView::Contact; + if ( suptypes.tqcontains( FolderLister::All ) ) types << FolderListView::All; + if ( suptypes.tqcontains( FolderLister::Unknown ) ) types << FolderListView::Unknown; mFolderList->setEnabledTypes( types ); connect( mFolderLister, TQT_SIGNAL( foldersRead() ), TQT_SLOT( updateFolderList() ) ); diff --git a/kresources/lib/folderlister.cpp b/kresources/lib/folderlister.cpp index cd203463c..a39b316a9 100644 --- a/kresources/lib/folderlister.cpp +++ b/kresources/lib/folderlister.cpp @@ -50,11 +50,11 @@ void FolderLister::setWriteDestinationId( KPIM::FolderLister::ContentType type, TQString FolderLister::writeDestinationId( KPIM::FolderLister::ContentType type ) const { - if ( mWriteDestinationId.contains( type ) ) { + if ( mWriteDestinationId.tqcontains( type ) ) { return mWriteDestinationId[type]; - } else if ( mWriteDestinationId.contains( KPIM::FolderLister::All ) ) { + } else if ( mWriteDestinationId.tqcontains( KPIM::FolderLister::All ) ) { return mWriteDestinationId[ KPIM::FolderLister::All ]; - } else if ( mWriteDestinationId.contains( KPIM::FolderLister::Unknown ) ) { + } else if ( mWriteDestinationId.tqcontains( KPIM::FolderLister::Unknown ) ) { return mWriteDestinationId[ KPIM::FolderLister::Unknown ]; } else return TQString::null; } @@ -196,7 +196,7 @@ void FolderLister::writeConfig( GroupwarePrefsBase *newprefs ) TQStringList defaultFolders; #define writeDestination(type) \ - if ( mWriteDestinationId.contains( type ) ) \ + if ( mWriteDestinationId.tqcontains( type ) ) \ defaultFolders << mWriteDestinationId[type]; \ else defaultFolders << TQString::null; writeDestination( KPIM::FolderLister::Event ); @@ -262,7 +262,7 @@ void FolderLister::doRetrieveFolder( const KURL &u ) KURL url( u ); if ( adaptor() ) adaptor()->adaptDownloadUrl( url ); - if ( mUrls.contains( url ) || mProcessedPathes.contains( url.path(-1) ) ) { + if ( mUrls.tqcontains( url ) || mProcessedPathes.tqcontains( url.path(-1) ) ) { kdDebug()<<"Item "<<u.path(-1)<<" is already being downloaded "<<endl; } else { diff --git a/kresources/lib/folderlistview.cpp b/kresources/lib/folderlistview.cpp index b29e61c9d..d0a11f434 100644 --- a/kresources/lib/folderlistview.cpp +++ b/kresources/lib/folderlistview.cpp @@ -54,37 +54,37 @@ void FolderListView::setEnabledTypes( const TQValueList<Property> &types ) kdDebug() << "FolderListView::setEnabledTypes" << endl; for ( int i = 0; i< columns(); ++i ) removeColumn( i ); mTypes = types; - if ( !mTypes.contains( FolderName ) ) mTypes.prepend( FolderName ); + if ( !mTypes.tqcontains( FolderName ) ) mTypes.prepend( FolderName ); mColumnMap[FolderName] = addColumn( i18n("Folder") ); mTypeMap[mColumnMap[FolderName]] = FolderName; - if ( mTypes.contains( Event ) ) { + if ( mTypes.tqcontains( Event ) ) { mColumnMap[Event] = addColumn( i18n("Short column header meaning default for new events", "Events") ); mTypeMap[mColumnMap[Event]] = Event; } else mColumnMap[Event] = -1; - if ( mTypes.contains( Todo ) ) { + if ( mTypes.tqcontains( Todo ) ) { mColumnMap[Todo] = addColumn( i18n("Short column header meaning default for new to-dos", "Todos") ); mTypeMap[mColumnMap[Todo]] = Todo; } else mColumnMap[Todo] = -1; - if ( mTypes.contains( Journal ) ) { + if ( mTypes.tqcontains( Journal ) ) { mColumnMap[Journal] = addColumn( i18n("Short column header meaning default for new journals", "Journals") ); mTypeMap[mColumnMap[Journal]] = Journal; } else mColumnMap[Journal] = -1; - if ( mTypes.contains( Contact ) ) { + if ( mTypes.tqcontains( Contact ) ) { mColumnMap[Contact] = addColumn( i18n("Short column header meaning default for new contacts", "Contacts") ); mTypeMap[mColumnMap[Contact]] = Contact; } else mColumnMap[Contact] = -1; - if ( mTypes.contains( All ) ) { + if ( mTypes.tqcontains( All ) ) { mColumnMap[All] = addColumn( i18n("Short column header meaning default for all items", "All") ); mTypeMap[mColumnMap[All]] = All; } else mColumnMap[All] = -1; - if ( mTypes.contains( Unknown ) ) { + if ( mTypes.tqcontains( Unknown ) ) { mColumnMap[Unknown] = addColumn( i18n("Short column header meaning default for unknown new items", "Unknown") ); mTypeMap[mColumnMap[Unknown]] = Unknown; } else mColumnMap[Unknown] = -1; @@ -103,27 +103,27 @@ void FolderListView::showPopupMenu( FolderListItem *i, const TQPoint &globalPos m.setItemChecked( id, i->isOn() ); m.insertSeparator(); - if ( ( folder.type & KPIM::FolderLister::Event ) && (mTypes.contains( Event ) ) ) { + if ( ( folder.type & KPIM::FolderLister::Event ) && (mTypes.tqcontains( Event ) ) ) { id = m.insertItem( i18n("Default for New &Events"), this, TQT_SLOT(slotPopupHandler(int)), 0, Event ); m.setItemChecked( id, i->isDefault( Event ) ); } - if ( ( folder.type & KPIM::FolderLister::Todo ) && (mTypes.contains( Todo ) ) ) { + if ( ( folder.type & KPIM::FolderLister::Todo ) && (mTypes.tqcontains( Todo ) ) ) { id = m.insertItem( i18n("Default for New &Todos"), this, TQT_SLOT(slotPopupHandler(int)), 0, Todo ); m.setItemChecked( id, i->isDefault( Todo ) ); } - if ( ( folder.type & KPIM::FolderLister::Journal ) && (mTypes.contains( Journal ) ) ) { + if ( ( folder.type & KPIM::FolderLister::Journal ) && (mTypes.tqcontains( Journal ) ) ) { id = m.insertItem( i18n("Default for New &Journals"), this, TQT_SLOT(slotPopupHandler(int)), 0, Journal ); m.setItemChecked( id, i->isDefault( Journal ) ); } - if ( ( folder.type & KPIM::FolderLister::Contact ) && (mTypes.contains( Contact ) ) ) { + if ( ( folder.type & KPIM::FolderLister::Contact ) && (mTypes.tqcontains( Contact ) ) ) { id = m.insertItem( i18n("Default for New &Contacts"), this, TQT_SLOT(slotPopupHandler(int)), 0, Contact ); m.setItemChecked( id, i->isDefault( Contact ) ); } - if ( ( folder.type == KPIM::FolderLister::All ) && (mTypes.contains( All ) ) ) { + if ( ( folder.type == KPIM::FolderLister::All ) && (mTypes.tqcontains( All ) ) ) { id = m.insertItem( i18n("Default for All New &Items"), this, TQT_SLOT(slotPopupHandler(int)), 0, All ); m.setItemChecked( id, i->isDefault( All ) ); } - if ( ( folder.type == KPIM::FolderLister::Unknown ) && (mTypes.contains( Unknown ) ) ) { + if ( ( folder.type == KPIM::FolderLister::Unknown ) && (mTypes.tqcontains( Unknown ) ) ) { id = m.insertItem( i18n("Default for &Unknown New Items"), this, TQT_SLOT(slotPopupHandler(int)), 0, Unknown ); m.setItemChecked( id, i->isDefault( Unknown ) ); } @@ -134,7 +134,7 @@ void FolderListView::showPopupMenu( FolderListItem *i, const TQPoint &globalPos void FolderListView::showPopupMenu( TQListViewItem *i ) { if ( dynamic_cast<FolderListItem*>(i) ) - showPopupMenu( (FolderListItem*)i, viewport()->mapToGlobal(itemRect(i).topLeft()) ); + showPopupMenu( (FolderListItem*)i, viewport()->mapToGlobal(tqitemRect(i).topLeft()) ); } void FolderListView::slotPopupHandler( int z ) @@ -152,7 +152,7 @@ void FolderListView::slotMousePressed(int btn, TQListViewItem* i, const TQPoint& } else if ( btn == Qt::LeftButton && c > 0 ) { // map pos to item/column and call FolderListItem::activate(col, pos) - ((FolderListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, itemRect(i).top() ) ); + ((FolderListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, tqitemRect(i).top() ) ); // } else { // KListView::slotMousePressed( btn, i, pos, c ); } @@ -184,7 +184,7 @@ void FolderListItem::activate( int column, const TQPoint &localPos ) default: return; } - if ( !TQRect( x, 0, w, BoxSize ).contains( localPos ) ) + if ( !TQRect( x, 0, w, BoxSize ).tqcontains( localPos ) ) changeProperty( prop ); } @@ -242,7 +242,7 @@ void FolderListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int col, i if ( !lv ) return; // use a private color group and set the text/highlighted text colors -// TQColorGroup mcg = lv->viewport()->colorGroup(); +// TQColorGroup mcg = lv->viewport()->tqcolorGroup(); FolderListView::Property prop( mFolderListView->typeForColumn(col) ); if ( prop == FolderListView::FolderName ) { @@ -293,4 +293,4 @@ void FolderListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int col, i //END #include "folderlistview.moc" -// kate: space-indent on; indent-width 2; replace-tabs on; +// kate: space-indent on; indent-width 2; tqreplace-tabs on; diff --git a/kresources/lib/folderlistview.h b/kresources/lib/folderlistview.h index e7b634ef6..627668305 100644 --- a/kresources/lib/folderlistview.h +++ b/kresources/lib/folderlistview.h @@ -54,8 +54,8 @@ class FolderListView : public KListView void emitChanged() { emit changed(); }; void setEnabledTypes( const TQValueList<Property> &types ); - int columnForType( Property prop ) const { if ( mColumnMap.contains(prop) ) return mColumnMap[prop]; else return -1;} - Property typeForColumn( int col ) const { if ( mTypeMap.contains( col ) ) return mTypeMap[col]; else return Unknown; } + int columnForType( Property prop ) const { if ( mColumnMap.tqcontains(prop) ) return mColumnMap[prop]; else return -1;} + Property typeForColumn( int col ) const { if ( mTypeMap.tqcontains( col ) ) return mTypeMap[col]; else return Unknown; } private slots: /* Display a popupmenu for item i at item position */ @@ -126,4 +126,4 @@ class FolderListItem : public QCheckListItem #endif -// kate: space-indent on; indent-width 2; replace-tabs on; +// kate: space-indent on; indent-width 2; tqreplace-tabs on; diff --git a/kresources/lib/folderselectdialog.cpp b/kresources/lib/folderselectdialog.cpp index c4d343598..8703c4415 100644 --- a/kresources/lib/folderselectdialog.cpp +++ b/kresources/lib/folderselectdialog.cpp @@ -42,16 +42,16 @@ FolderSelectDialog::FolderSelectDialog( const TQString& caption, const TQString& : KDialogBase(0, 0, true, caption, Ok|Cancel, Ok, true) { TQFrame* frame = makeMainWidget(); - TQVBoxLayout* layout = new TQVBoxLayout( frame, 0, spacingHint() ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( frame, 0, spacingHint() ); TQLabel* labelWidget = new TQLabel( label, frame ); - layout->addWidget( labelWidget ); + tqlayout->addWidget( labelWidget ); mListBox = new KListBox( frame ); mListBox->insertStringList( list ); mListBox->setSelected( 0, true ); mListBox->ensureCurrentVisible(); - layout->addWidget( mListBox, 10 ); + tqlayout->addWidget( mListBox, 10 ); connect( mListBox, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ), TQT_SLOT( slotOk() ) ); @@ -60,7 +60,7 @@ FolderSelectDialog::FolderSelectDialog( const TQString& caption, const TQString& mListBox->setFocus(); - layout->addStretch(); + tqlayout->addStretch(); setMinimumWidth( 320 ); } diff --git a/kresources/lib/groupwaredataadaptor.cpp b/kresources/lib/groupwaredataadaptor.cpp index 033ea81de..53b2ecdb4 100644 --- a/kresources/lib/groupwaredataadaptor.cpp +++ b/kresources/lib/groupwaredataadaptor.cpp @@ -78,7 +78,7 @@ kdDebug()<<"GroupwareUploadItem::createUploadNewJob, baseurl=" << baseurl.url() if ( job ) { kdDebug() << "Adding If-None-Match " << endl; TQString header; - if ( job->outgoingMetaData().contains("customHTTPHeader") ) { + if ( job->outgoingMetaData().tqcontains("customHTTPHeader") ) { header = job->outgoingMetaData()["customHTTPHeader"]; header += "\r\n"; } @@ -96,7 +96,7 @@ kdDebug()<<"GroupwareUploadItem::createUploadJob" << endl; if ( job && adaptor ) { kdDebug()<<"Adding If-Match header: " << adaptor->idMapper()->fingerprint( uid() ) << endl; TQString header; - if ( job->outgoingMetaData().contains("customHTTPHeader") ) { + if ( job->outgoingMetaData().tqcontains("customHTTPHeader") ) { header = job->outgoingMetaData()["customHTTPHeader"]; header += "\r\n"; } @@ -262,7 +262,7 @@ bool GroupwareDataAdaptor::interpretUploadNewJob( KIO::Job *job, const TQString TQString GroupwareDataAdaptor::uidFromJob( KIO::Job *job ) const { kdDebug()<<"GroupwareDataAdaptor::uidFromJob( "<<job<<")"<<endl; - if ( mJobUIDMap.contains( job ) ) { + if ( mJobUIDMap.tqcontains( job ) ) { kdDebug()<<" Contained: "<< mJobUIDMap[job] << endl; return mJobUIDMap[ job ]; } else { diff --git a/kresources/lib/groupwaredataadaptor.h b/kresources/lib/groupwaredataadaptor.h index 52021a07b..95119354c 100644 --- a/kresources/lib/groupwaredataadaptor.h +++ b/kresources/lib/groupwaredataadaptor.h @@ -240,7 +240,7 @@ Q_OBJECT virtual FolderLister::Entry::List defaultFolders(); virtual TQValueList<FolderLister::ContentType> supportedTypes() = 0; virtual bool supports( FolderLister::ContentType type ) { - return supportedTypes().contains( type ); + return supportedTypes().tqcontains( type ); } diff --git a/kresources/lib/groupwaredownloadjob.cpp b/kresources/lib/groupwaredownloadjob.cpp index 7bfa804a7..85f9c9f34 100644 --- a/kresources/lib/groupwaredownloadjob.cpp +++ b/kresources/lib/groupwaredownloadjob.cpp @@ -229,9 +229,9 @@ void GroupwareDownloadJob::slotItemToDownload( const KURL &remoteURL, { KURL url( remoteURL ); adaptor()->adaptDownloadUrl( url ); - if ( !mItemsForDownload.contains( url ) && - !mItemsDownloading.contains( url ) && - !mItemsDownloaded.contains( url ) ) { + if ( !mItemsForDownload.tqcontains( url ) && + !mItemsDownloading.tqcontains( url ) && + !mItemsDownloaded.tqcontains( url ) ) { mItemsForDownload.insert( url, type ); } } @@ -240,7 +240,7 @@ void GroupwareDownloadJob::slotItemToDownload( const KURL &remoteURL, void GroupwareDownloadJob::slotItemOnServer( const KURL &remoteURL ) { kdDebug()<<"GroupwareDownloadJob::slotItemOnServer( " << remoteURL.url() << ")" << endl; - if ( !mCurrentlyOnServer.contains( remoteURL ) ) { + if ( !mCurrentlyOnServer.tqcontains( remoteURL ) ) { mCurrentlyOnServer.append( remoteURL ); } } @@ -249,9 +249,9 @@ kdDebug()<<"GroupwareDownloadJob::slotItemOnServer( " << remoteURL.url() << ")" void GroupwareDownloadJob::slotItemDownloadError( const KURL &remoteURL, const TQString &/*error*/ ) { // TODO: Error handling! - if ( mItemsDownloading.contains( remoteURL ) ) { + if ( mItemsDownloading.tqcontains( remoteURL ) ) { mItemsDownloadError[ remoteURL ] = mItemsDownloading[ remoteURL ]; - } else if ( mItemsForDownload.contains( remoteURL ) ) { + } else if ( mItemsForDownload.tqcontains( remoteURL ) ) { mItemsDownloadError[ remoteURL ] = mItemsForDownload[ remoteURL ]; } } @@ -261,15 +261,15 @@ void GroupwareDownloadJob::slotItemDownloaded( const TQString &localID, const KURL &remoteURL, const TQString &fingerprint ) { kdDebug()<<"GroupwareDownloadJob::slotItemDownloaded( " << localID << ", " << remoteURL.url() << ", " << fingerprint << ")" << endl; - if ( mItemsForDownload.contains( remoteURL ) ) { + if ( mItemsForDownload.tqcontains( remoteURL ) ) { mItemsDownloaded[ remoteURL ] = mItemsForDownload[ remoteURL ]; mItemsForDownload.remove( remoteURL ); } - if ( mItemsDownloading.contains( remoteURL ) ) { + if ( mItemsDownloading.tqcontains( remoteURL ) ) { mItemsDownloaded[ remoteURL ] = mItemsDownloading[ remoteURL ]; mItemsDownloading.remove( remoteURL ); } - if ( !mItemsDownloaded.contains( remoteURL ) ) { + if ( !mItemsDownloaded.tqcontains( remoteURL ) ) { mItemsDownloaded[ remoteURL ] = KPIM::FolderLister::Unknown; } adaptor()->idMapper()->setRemoteId( localID, remoteURL.path() ); diff --git a/kresources/lib/kcal_resourcegroupwarebase.cpp b/kresources/lib/kcal_resourcegroupwarebase.cpp index 823943c2b..11db0e81e 100644 --- a/kresources/lib/kcal_resourcegroupwarebase.cpp +++ b/kresources/lib/kcal_resourcegroupwarebase.cpp @@ -219,7 +219,7 @@ void ResourceGroupwareBase::enter_loop() TQWidget dummy(0,0,WType_Dialog | WShowModal); dummy.setFocusPolicy( TQWidget::NoFocus ); qt_enter_modal(&dummy); - qApp->enter_loop(); + tqApp->enter_loop(); qt_leave_modal(&dummy); } // END:COPIED @@ -228,7 +228,7 @@ void ResourceGroupwareBase::slotLoginJobResult( KIO::Job *job ) { if ( !adaptor() ) return; mLoginFinished = adaptor()->interpretLoginJobResult( job ); - qApp->exit_loop(); + tqApp->exit_loop(); } void ResourceGroupwareBase::doClose() @@ -251,7 +251,7 @@ void ResourceGroupwareBase::slotLogoffJobResult( KIO::Job *job ) if ( !adaptor() ) return; adaptor()->interpretLogoffJobResult( job ); // TODO: Do we really need to block while waiting for the job to return? - qApp->exit_loop(); + tqApp->exit_loop(); } bool ResourceGroupwareBase::doLoad() |