diff options
Diffstat (limited to 'kresources/lib')
34 files changed, 502 insertions, 502 deletions
diff --git a/kresources/lib/addressbookadaptor.cpp b/kresources/lib/addressbookadaptor.cpp index f698e5430..900772e56 100644 --- a/kresources/lib/addressbookadaptor.cpp +++ b/kresources/lib/addressbookadaptor.cpp @@ -51,18 +51,18 @@ AddressBookAdaptor::AddressBookAdaptor() { } -QString AddressBookAdaptor::mimeType() const +TQString AddressBookAdaptor::mimeType() const { return "text/x-vcard"; } -bool AddressBookAdaptor::localItemExists( const QString &localId ) +bool AddressBookAdaptor::localItemExists( const TQString &localId ) { KABC::Addressee a = mResource->findByUid( localId ); return !a.isEmpty(); } -bool AddressBookAdaptor::localItemHasChanged( const QString &localId ) +bool AddressBookAdaptor::localItemHasChanged( const TQString &localId ) { KABC::Addressee::List addressees = mResource->deletedAddressees(); KABC::Addressee::List::ConstIterator it; @@ -79,7 +79,7 @@ bool AddressBookAdaptor::localItemHasChanged( const QString &localId ) } -void AddressBookAdaptor::deleteItem( const QString &localId ) +void AddressBookAdaptor::deleteItem( const TQString &localId ) { KABC::Addressee a = mResource->findByUid( localId ); if ( !a.isEmpty() ) { @@ -98,12 +98,12 @@ void AddressBookAdaptor::addItem( KABC::Addressee addr ) } void AddressBookAdaptor::addressbookItemDownloaded( KABC::Addressee addr, - const QString &newLocalId, const KURL &remoteId, const QString &fingerprint, - const QString &storagelocation ) + const TQString &newLocalId, const KURL &remoteId, const TQString &fingerprint, + const TQString &storagelocation ) { // remove the currently existing item from the cache deleteItem( newLocalId ); - QString localId = idMapper()->localId( remoteId.path() ); + TQString localId = idMapper()->localId( remoteId.path() ); if ( !localId.isEmpty() ) deleteItem( localId ); // add the new item @@ -118,7 +118,7 @@ void AddressBookAdaptor::addressbookItemDownloaded( KABC::Addressee addr, } -void AddressBookAdaptor::clearChange( const QString &uid ) +void AddressBookAdaptor::clearChange( const TQString &uid ) { mResource->clearChange( uid ); } diff --git a/kresources/lib/addressbookadaptor.h b/kresources/lib/addressbookadaptor.h index fb9f2971d..fb4408eca 100644 --- a/kresources/lib/addressbookadaptor.h +++ b/kresources/lib/addressbookadaptor.h @@ -48,9 +48,9 @@ class KDE_EXPORT AddressBookAdaptor : public KPIM::GroupwareDataAdaptor public: AddressBookAdaptor(); - QValueList<KPIM::FolderLister::ContentType> supportedTypes() + TQValueList<KPIM::FolderLister::ContentType> supportedTypes() { - QValueList<KPIM::FolderLister::ContentType> types; + TQValueList<KPIM::FolderLister::ContentType> types; types << KPIM::FolderLister::Contact; return types; } @@ -70,18 +70,18 @@ class KDE_EXPORT AddressBookAdaptor : public KPIM::GroupwareDataAdaptor return mResource; } - QString mimeType() const; - bool localItemExists( const QString &localId ); - bool localItemHasChanged( const QString &localId ); - void deleteItem( const QString &localId ); + TQString mimeType() const; + bool localItemExists( const TQString &localId ); + bool localItemHasChanged( const TQString &localId ); + void deleteItem( const TQString &localId ); void addItem( KABC::Addressee addr ); - void clearChange( const QString &uid ); + void clearChange( const TQString &uid ); virtual KPIM::GroupwareUploadItem *newUploadItem( KABC::Addressee addr, KPIM::GroupwareUploadItem::UploadType type ); virtual void addressbookItemDownloaded( KABC::Addressee addr, - const QString &newLocalId, const KURL &remoteId, - const QString &fingerprint, const QString &storagelocation ); + const TQString &newLocalId, const KURL &remoteId, + const TQString &fingerprint, const TQString &storagelocation ); private: KABC::ResourceCached *mResource; diff --git a/kresources/lib/calendaradaptor.cpp b/kresources/lib/calendaradaptor.cpp index ddba9961c..88685bdfe 100644 --- a/kresources/lib/calendaradaptor.cpp +++ b/kresources/lib/calendaradaptor.cpp @@ -58,18 +58,18 @@ CalendarAdaptor::CalendarAdaptor() { } -QString CalendarAdaptor::mimeType() const +TQString CalendarAdaptor::mimeType() const { return "text/calendar"; } -bool CalendarAdaptor::localItemExists( const QString &localId ) +bool CalendarAdaptor::localItemExists( const TQString &localId ) { KCal::Incidence *i = mResource->incidence( localId ); return i; } -bool CalendarAdaptor::localItemHasChanged( const QString &localId ) +bool CalendarAdaptor::localItemHasChanged( const TQString &localId ) { KCal::Incidence *i = mResource->incidence( localId ); if ( !i ) return false; @@ -86,7 +86,7 @@ bool CalendarAdaptor::localItemHasChanged( const QString &localId ) return false; } -void CalendarAdaptor::deleteItem( const QString &localId ) +void CalendarAdaptor::deleteItem( const TQString &localId ) { mResource->disableChangeNotification(); KCal::Incidence *i = mResource->incidence( localId ); @@ -113,13 +113,13 @@ void CalendarAdaptor::addItem( KCal::Incidence *i) void CalendarAdaptor::calendarItemDownloaded( KCal::Incidence *inc, - const QString &newLocalId, const KURL &remoteId, const QString &fingerprint, - const QString &storagelocation ) + const TQString &newLocalId, const KURL &remoteId, const TQString &fingerprint, + const TQString &storagelocation ) { kdDebug() << "CalendarAdaptor::calendarItemDownloaded, inc=" << inc->summary() << ", local=" << newLocalId << ", remote=" << remoteId.url() << ", fpr=" << fingerprint << ", storagelocation="<< storagelocation << endl; // remove the currently existing item from the cache deleteItem( newLocalId ); - QString localId = idMapper()->localId( remoteId.path() ); + TQString localId = idMapper()->localId( remoteId.path() ); if ( !localId.isEmpty() ) deleteItem( localId ); // add the new item @@ -135,7 +135,7 @@ kdDebug() << "CalendarAdaptor::calendarItemDownloaded, inc=" << inc->summary() < } -void CalendarAdaptor::clearChange( const QString &uid ) +void CalendarAdaptor::clearChange( const TQString &uid ) { KCal::Incidence *i = mResource->incidence( uid ); mResource->clearChange( i ); diff --git a/kresources/lib/calendaradaptor.h b/kresources/lib/calendaradaptor.h index 6ef338d18..fddcfd7aa 100644 --- a/kresources/lib/calendaradaptor.h +++ b/kresources/lib/calendaradaptor.h @@ -55,9 +55,9 @@ class KDE_EXPORT CalendarAdaptor : public KPIM::GroupwareDataAdaptor public: CalendarAdaptor(); - QValueList<KPIM::FolderLister::ContentType> supportedTypes() + TQValueList<KPIM::FolderLister::ContentType> supportedTypes() { - QValueList<KPIM::FolderLister::ContentType> types; + TQValueList<KPIM::FolderLister::ContentType> types; types << KPIM::FolderLister::Event; types << KPIM::FolderLister::Todo; types << KPIM::FolderLister::Journal; @@ -79,11 +79,11 @@ class KDE_EXPORT CalendarAdaptor : public KPIM::GroupwareDataAdaptor return mResource; } - virtual QString mimeType() const; - bool localItemExists( const QString &localId ); - bool localItemHasChanged( const QString &localId ); - void deleteItem( const QString &localId ); - void clearChange( const QString &uid ); + virtual TQString mimeType() const; + bool localItemExists( const TQString &localId ); + bool localItemHasChanged( const TQString &localId ); + void deleteItem( const TQString &localId ); + void clearChange( const TQString &uid ); virtual KPIM::GroupwareUploadItem *newUploadItem( KCal::Incidence*it, KPIM::GroupwareUploadItem::UploadType type ); @@ -91,17 +91,17 @@ class KDE_EXPORT CalendarAdaptor : public KPIM::GroupwareDataAdaptor public slots: /** newLocalId is the new id that was (randomly) assigned to the item */ virtual void calendarItemDownloaded( KCal::Incidence *inc, - const QString &newLocalId, const KURL &remoteId, - const QString &fingerprint, const QString &storagelocation ); + const TQString &newLocalId, const KURL &remoteId, + const TQString &fingerprint, const TQString &storagelocation ); protected: void addItem( KCal::Incidence *i ); private: KCal::ResourceCached *mResource; - QStringList mAddedItems; - QStringList mChangedItems; - QStringList mDeletedItems; + TQStringList mAddedItems; + TQStringList mChangedItems; + TQStringList mDeletedItems; }; } diff --git a/kresources/lib/davaddressbookadaptor.cpp b/kresources/lib/davaddressbookadaptor.cpp index 1ce009654..b6f54c1e1 100644 --- a/kresources/lib/davaddressbookadaptor.cpp +++ b/kresources/lib/davaddressbookadaptor.cpp @@ -42,17 +42,17 @@ void DavAddressBookAdaptor::interpretListFoldersJob( KIO::Job *job, KPIM::Folder Q_ASSERT( davjob ); if ( !davjob ) return; - QDomDocument doc = davjob->response(); + TQDomDocument doc = davjob->response(); kdDebug(7000) << " Doc: " << doc.toString() << endl; - QDomElement docElement = doc.documentElement(); - QDomNode n; + TQDomElement docElement = doc.documentElement(); + TQDomNode n; for( n = docElement.firstChild(); !n.isNull(); n = n.nextSibling() ) { - QDomNode n2 = n.namedItem( "propstat" ); - QDomNode n3 = n2.namedItem( "prop" ); + TQDomNode n2 = n.namedItem( "propstat" ); + TQDomNode n3 = n2.namedItem( "prop" ); KURL href( n.namedItem( "href" ).toElement().text() ); - QString displayName = n3.namedItem( "displayname" ).toElement().text(); + TQString displayName = n3.namedItem( "displayname" ).toElement().text(); KPIM::FolderLister::ContentType type = getContentType( n3 ); emit folderInfoRetrieved( href, displayName, type ); diff --git a/kresources/lib/davaddressbookadaptor.h b/kresources/lib/davaddressbookadaptor.h index ef5c04077..bdf9e35b8 100644 --- a/kresources/lib/davaddressbookadaptor.h +++ b/kresources/lib/davaddressbookadaptor.h @@ -23,7 +23,7 @@ #include "addressbookadaptor.h" #include "folderlister.h" -#include <qdom.h> +#include <tqdom.h> #include <kdepimmacros.h> namespace KABC { @@ -41,10 +41,10 @@ class KDE_EXPORT DavAddressBookAdaptor : public AddressBookAdaptor virtual void interpretListFoldersJob( KIO::Job *job, KPIM::FolderLister *folderLister ); /** Returns the type of folder retrieved in the dom node. Typically, you'll compare the DAV:resourcetype property with some values. */ - virtual KPIM::FolderLister::ContentType getContentType( const QDomNode &folderNode ) = 0; + virtual KPIM::FolderLister::ContentType getContentType( const TQDomNode &folderNode ) = 0; /** Extract from the dav response whether the folder has subitems that need to be examined */ - virtual bool getFolderHasSubs( const QDomNode &folderNode ) = 0; + virtual bool getFolderHasSubs( const TQDomNode &folderNode ) = 0; }; } diff --git a/kresources/lib/davcalendaradaptor.cpp b/kresources/lib/davcalendaradaptor.cpp index 541b12bb8..a950e405c 100644 --- a/kresources/lib/davcalendaradaptor.cpp +++ b/kresources/lib/davcalendaradaptor.cpp @@ -25,7 +25,7 @@ #include <kio/davjob.h> // #include <folderlister.h> -// #include <qdom.h> +// #include <tqdom.h> using namespace KCal; @@ -37,17 +37,17 @@ void DavCalendarAdaptor::interpretListFoldersJob( KIO::Job *job, KPIM::FolderLis Q_ASSERT( davjob ); if ( !davjob ) return; - QDomDocument doc = davjob->response(); + TQDomDocument doc = davjob->response(); kdDebug(7000) << " Doc: " << doc.toString() << endl; - QDomElement docElement = doc.documentElement(); - QDomNode n; + TQDomElement docElement = doc.documentElement(); + TQDomNode n; for( n = docElement.firstChild(); !n.isNull(); n = n.nextSibling() ) { - QDomNode n2 = n.namedItem( "propstat" ); - QDomNode n3 = n2.namedItem( "prop" ); + TQDomNode n2 = n.namedItem( "propstat" ); + TQDomNode n3 = n2.namedItem( "prop" ); KURL href( n.namedItem( "href" ).toElement().text() ); - QString displayName = n3.namedItem( "displayname" ).toElement().text(); + TQString displayName = n3.namedItem( "displayname" ).toElement().text(); KPIM::FolderLister::ContentType type = getContentType( n3 ); emit folderInfoRetrieved( href, displayName, type ); diff --git a/kresources/lib/davcalendaradaptor.h b/kresources/lib/davcalendaradaptor.h index 3c4a7bc4f..b7aba04ea 100644 --- a/kresources/lib/davcalendaradaptor.h +++ b/kresources/lib/davcalendaradaptor.h @@ -23,7 +23,7 @@ #include "calendaradaptor.h" #include "folderlister.h" -#include <qdom.h> +#include <tqdom.h> #include <kdepimmacros.h> namespace KCal { @@ -41,10 +41,10 @@ class KDE_EXPORT DavCalendarAdaptor : public CalendarAdaptor virtual void interpretListFoldersJob( KIO::Job *job, KPIM::FolderLister *folderLister ); /** Returns the type of folder retrieved in the dom node. Typically, you'll compare the DAV:resourcetype property with some values. */ - virtual KPIM::FolderLister::ContentType getContentType( const QDomNode &folderNode ) = 0; + virtual KPIM::FolderLister::ContentType getContentType( const TQDomNode &folderNode ) = 0; /** Extract from the dav response whether the folder has subitems that need to be examined */ - virtual bool getFolderHasSubs( const QDomNode &folderNode ) = 0; + virtual bool getFolderHasSubs( const TQDomNode &folderNode ) = 0; }; } diff --git a/kresources/lib/folderconfig.cpp b/kresources/lib/folderconfig.cpp index b02654945..25fd7d826 100644 --- a/kresources/lib/folderconfig.cpp +++ b/kresources/lib/folderconfig.cpp @@ -32,35 +32,35 @@ #include <kdebug.h> #include <kdialog.h> -#include <qlayout.h> -#include <qgroupbox.h> -#include <qpushbutton.h> -#include <qcombobox.h> -#include <qhbox.h> -#include <qlabel.h> +#include <tqlayout.h> +#include <tqgroupbox.h> +#include <tqpushbutton.h> +#include <tqcombobox.h> +#include <tqhbox.h> +#include <tqlabel.h> using namespace KPIM; -FolderConfig::FolderConfig( QWidget *parent ) - : QWidget( parent ), mFolderLister( 0 ) +FolderConfig::FolderConfig( TQWidget *parent ) + : TQWidget( parent ), mFolderLister( 0 ) { - QBoxLayout *topLayout = new QVBoxLayout( this ); + TQBoxLayout *topLayout = new TQVBoxLayout( this ); topLayout->addSpacing( KDialog::spacingHint() ); - QGroupBox *topBox = new QGroupBox( 1, Horizontal, i18n("Folder Selection"), + TQGroupBox *topBox = new TQGroupBox( 1, Horizontal, i18n("Folder Selection"), this ); topLayout->addWidget( topBox ); - QPushButton *button = new QPushButton( i18n("Update Folder List"), topBox ); - connect( button, SIGNAL( clicked() ), SIGNAL( updateFoldersClicked() ) ); + TQPushButton *button = new TQPushButton( i18n("Update Folder List"), topBox ); + connect( button, TQT_SIGNAL( clicked() ), TQT_SIGNAL( updateFoldersClicked() ) ); mFolderList = new FolderListView( topBox ); -/* QHBox *writeBox = new QHBox( topBox ); +/* TQHBox *writeBox = new TQHBox( topBox ); - new QLabel( i18n("Write to:"), writeBox ); + new TQLabel( i18n("Write to:"), writeBox ); - mWriteCombo = new QComboBox( writeBox );*/ + mWriteCombo = new TQComboBox( writeBox );*/ } FolderConfig::~FolderConfig() @@ -71,8 +71,8 @@ void FolderConfig::setFolderLister( FolderLister *f ) { mFolderLister = f; - QValueList<FolderListView::Property> types; - QValueList<FolderLister::ContentType> suptypes( mFolderLister->supportedTypes() ); + 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; @@ -81,7 +81,7 @@ void FolderConfig::setFolderLister( FolderLister *f ) if ( suptypes.contains( FolderLister::Unknown ) ) types << FolderListView::Unknown; mFolderList->setEnabledTypes( types ); - connect( mFolderLister, SIGNAL( foldersRead() ), SLOT( updateFolderList() ) ); + connect( mFolderLister, TQT_SIGNAL( foldersRead() ), TQT_SLOT( updateFolderList() ) ); } void FolderConfig::retrieveFolderList( const KURL &url ) @@ -100,7 +100,7 @@ void FolderConfig::updateFolderList() { mFolderList->clear(); - QStringList write; + TQStringList write; if ( !mOldFolderListerURL.isEmpty() && mFolderLister->adaptor() ) { mFolderLister->adaptor()->setBaseURL( mOldFolderListerURL ); @@ -134,11 +134,11 @@ void FolderConfig::updateFolderList() void FolderConfig::saveSettings() { - QPtrList<QListViewItem> lst; + TQPtrList<TQListViewItem> lst; FolderLister::Entry::List folders; - QListViewItemIterator it( mFolderList ); + TQListViewItemIterator it( mFolderList ); while ( it.current() ) { FolderListItem *item = dynamic_cast<FolderListItem *>( it.current() ); if ( item ) { diff --git a/kresources/lib/folderconfig.h b/kresources/lib/folderconfig.h index 5926392cc..c27d8fdf6 100644 --- a/kresources/lib/folderconfig.h +++ b/kresources/lib/folderconfig.h @@ -25,7 +25,7 @@ #include <kurl.h> #include <kdepimmacros.h> -#include <qwidget.h> +#include <tqwidget.h> // class KListView; class QComboBox; @@ -39,7 +39,7 @@ class KDE_EXPORT FolderConfig : public QWidget { Q_OBJECT public: - FolderConfig( QWidget *parent ); + FolderConfig( TQWidget *parent ); ~FolderConfig(); void setFolderLister( FolderLister * ); diff --git a/kresources/lib/folderlister.cpp b/kresources/lib/folderlister.cpp index faf2204f7..cd203463c 100644 --- a/kresources/lib/folderlister.cpp +++ b/kresources/lib/folderlister.cpp @@ -29,7 +29,7 @@ #include <kdebug.h> #include <kconfig.h> -#include <qstringlist.h> +#include <tqstringlist.h> using namespace KPIM; @@ -43,12 +43,12 @@ void FolderLister::setFolders( const FolderLister::Entry::List &folders ) mFolders = folders; } -void FolderLister::setWriteDestinationId( KPIM::FolderLister::ContentType type, const QString &id ) +void FolderLister::setWriteDestinationId( KPIM::FolderLister::ContentType type, const TQString &id ) { mWriteDestinationId[ type ] = id; } -QString FolderLister::writeDestinationId( KPIM::FolderLister::ContentType type ) const +TQString FolderLister::writeDestinationId( KPIM::FolderLister::ContentType type ) const { if ( mWriteDestinationId.contains( type ) ) { return mWriteDestinationId[type]; @@ -56,7 +56,7 @@ QString FolderLister::writeDestinationId( KPIM::FolderLister::ContentType type ) return mWriteDestinationId[ KPIM::FolderLister::All ]; } else if ( mWriteDestinationId.contains( KPIM::FolderLister::Unknown ) ) { return mWriteDestinationId[ KPIM::FolderLister::Unknown ]; - } else return QString::null; + } else return TQString::null; } @@ -74,7 +74,7 @@ KURL::List FolderLister::activeFolderIds() const return ids; } -bool FolderLister::isActive( const QString &id ) const +bool FolderLister::isActive( const TQString &id ) const { FolderLister::Entry::List::ConstIterator it; for( it = mFolders.begin(); it != mFolders.end(); ++it ) { @@ -83,10 +83,10 @@ bool FolderLister::isActive( const QString &id ) const return false; } -QStringList FolderLister::contentTypeToStrings( ContentType type ) +TQStringList FolderLister::contentTypeToStrings( ContentType type ) { kdDebug() << "FolderLister::contentTypeToStrings( type=" << type << ")" << endl; - QStringList cont; + TQStringList cont; if ( type == All ) { cont << "All"; } else if ( type == Unknown ) { @@ -103,7 +103,7 @@ kdDebug() << "FolderLister::contentTypeToStrings( type=" << type << ")" << endl; return cont; } -FolderLister::ContentType FolderLister::contentTypeFromString( const QString &type ) +FolderLister::ContentType FolderLister::contentTypeFromString( const TQString &type ) { if ( type == "All" ) return All; if ( type == "Contact" ) return Contact; @@ -116,12 +116,12 @@ FolderLister::ContentType FolderLister::contentTypeFromString( const QString &ty return Unknown; } -QValueList<FolderLister::ContentType> FolderLister::supportedTypes() +TQValueList<FolderLister::ContentType> FolderLister::supportedTypes() { if ( adaptor() ) { return adaptor()->supportedTypes(); } else { - return QValueList<ContentType>(); + return TQValueList<ContentType>(); } } @@ -132,12 +132,12 @@ void FolderLister::readConfig( KPIM::GroupwarePrefsBase *newprefs ) kdDebug(7000) << "FolderLister::readConfig()" << endl; mFolders.clear(); - QStringList active = newprefs->activeFolders(); + TQStringList active = newprefs->activeFolders(); int nr = newprefs->folderNumber(); for ( int i=0; i<nr; ++i ) { - QStringList l( newprefs->folder( i ) ); -// QStringList l( cfgg.readListEntry( QString("Folder%1").arg( i ) ) ); + TQStringList l( newprefs->folder( i ) ); +// TQStringList l( cfgg.readListEntry( TQString("Folder%1").arg( i ) ) ); Entry e; if ( l.count()>0 ) { e.id = l.first(); @@ -148,14 +148,14 @@ void FolderLister::readConfig( KPIM::GroupwarePrefsBase *newprefs ) l.pop_front(); } e.type = Unknown; - for ( QStringList::Iterator it = l.begin(); it != l.end(); ++it ) { + for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it ) { e.type = (FolderLister::ContentType)( e.type | contentTypeFromString( *it ) ); } if ( active.find( e.id ) != active.end() ) e.active = true; mFolders.append( e ); } - QStringList destinations( newprefs->defaultDestinations() ); + TQStringList destinations( newprefs->defaultDestinations() ); #define readDestination(type) \ if ( destinations.count()>0 ) { \ @@ -173,20 +173,20 @@ void FolderLister::readConfig( KPIM::GroupwarePrefsBase *newprefs ) void FolderLister::writeConfig( GroupwarePrefsBase *newprefs ) { - QStringList ids; - QStringList names; - QStringList active; + TQStringList ids; + TQStringList names; + TQStringList active; // KConfigGroup cfgg( newprefs->config(), "Folders" ); int nr = 0; Entry::List::ConstIterator it; for( it = mFolders.begin(); it != mFolders.end(); ++it ) { - QStringList lst; + TQStringList lst; lst << (*it).id; lst << (*it).name; lst += contentTypeToStrings( (*it).type ); newprefs->setFolder( nr, lst ); -// cfgg.writeEntry( QString("Folder%1").arg( nr ), lst ); +// cfgg.writeEntry( TQString("Folder%1").arg( nr ), lst ); if ( (*it).active ) active.append( (*it).id ); nr++; } @@ -194,11 +194,11 @@ void FolderLister::writeConfig( GroupwarePrefsBase *newprefs ) newprefs->setActiveFolders( active ); - QStringList defaultFolders; + TQStringList defaultFolders; #define writeDestination(type) \ if ( mWriteDestinationId.contains( type ) ) \ defaultFolders << mWriteDestinationId[type]; \ - else defaultFolders << QString::null; + else defaultFolders << TQString::null; writeDestination( KPIM::FolderLister::Event ); writeDestination( KPIM::FolderLister::Todo ); writeDestination( KPIM::FolderLister::Journal ); @@ -216,12 +216,12 @@ void FolderLister::setAdaptor( KPIM::GroupwareDataAdaptor *adaptor ) disconnect( mAdaptor, 0, this, 0 ); } mAdaptor = adaptor; - connect( mAdaptor, SIGNAL( folderInfoRetrieved( const KURL &, - const QString &, KPIM::FolderLister::ContentType ) ), - this, SLOT( processFolderResult( const KURL &, const QString &, + connect( mAdaptor, TQT_SIGNAL( folderInfoRetrieved( const KURL &, + const TQString &, KPIM::FolderLister::ContentType ) ), + this, TQT_SLOT( processFolderResult( const KURL &, const TQString &, KPIM::FolderLister::ContentType ) ) ); - connect( mAdaptor, SIGNAL( folderSubitemRetrieved( const KURL &, bool ) ), - this, SLOT( folderSubitemRetrieved( const KURL &, bool ) ) ); + connect( mAdaptor, TQT_SIGNAL( folderSubitemRetrieved( const KURL &, bool ) ), + this, TQT_SLOT( folderSubitemRetrieved( const KURL &, bool ) ) ); } void FolderLister::folderSubitemRetrieved( const KURL &url, bool isFolder ) @@ -230,8 +230,8 @@ void FolderLister::folderSubitemRetrieved( const KURL &url, bool isFolder ) doRetrieveFolder( url ); else { KURL u( url ) ; - u.setUser( QString::null ); - u.setPass( QString::null ); + u.setUser( TQString::null ); + u.setPass( TQString::null ); mProcessedPathes.append( url.path(-1) ); } } @@ -272,8 +272,8 @@ void FolderLister::doRetrieveFolder( const KURL &u ) kdDebug(7000) << "FolderLister::retrieveFolders: adjustedURL=" << url.prettyURL() << endl; - connect( listjob, SIGNAL( result( KIO::Job * ) ), - SLOT( slotListJobResult( KIO::Job * ) ) ); + connect( listjob, TQT_SIGNAL( result( KIO::Job * ) ), + TQT_SLOT( slotListJobResult( KIO::Job * ) ) ); } else { // TODO: Indicate a problem to the user! kdWarning() << "Unable to create the folder list job for the url " @@ -296,7 +296,7 @@ FolderLister::Entry::List FolderLister::defaultFolders() } void FolderLister::processFolderResult( const KURL &href, - const QString &displayName, + const TQString &displayName, ContentType type ) { kdDebug() << "FolderLister::processFolderResult( href=" << href.url() << ", displayName=" << displayName << ", type=" << int(type) << endl; diff --git a/kresources/lib/folderlister.h b/kresources/lib/folderlister.h index c8a70ef10..f2f19d10e 100644 --- a/kresources/lib/folderlister.h +++ b/kresources/lib/folderlister.h @@ -28,10 +28,10 @@ #include <kurl.h> #include <kdepimmacros.h> -#include <qvaluelist.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qobject.h> +#include <tqvaluelist.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqobject.h> namespace KIO { class Job; @@ -62,17 +62,17 @@ class KDE_EXPORT FolderLister : public QObject public: Entry() : active( false ) {} - typedef QValueList<Entry> List; + typedef TQValueList<Entry> List; - QString id; - QString name; + TQString id; + TQString name; ContentType type; bool active; }; - static QStringList contentTypeToStrings( ContentType ); - ContentType contentTypeFromString( const QString &type ); + static TQStringList contentTypeToStrings( ContentType ); + ContentType contentTypeFromString( const TQString &type ); - QValueList<ContentType> supportedTypes(); + TQValueList<ContentType> supportedTypes(); FolderLister( Type ); @@ -86,10 +86,10 @@ class KDE_EXPORT FolderLister : public QObject GroupwareDataAdaptor* adaptor() const { return mAdaptor; } KURL::List activeFolderIds() const; - bool isActive( const QString &id ) const; + bool isActive( const TQString &id ) const; - void setWriteDestinationId( KPIM::FolderLister::ContentType type, const QString &dest ); - QString writeDestinationId( KPIM::FolderLister::ContentType type ) const; + void setWriteDestinationId( KPIM::FolderLister::ContentType type, const TQString &dest ); + TQString writeDestinationId( KPIM::FolderLister::ContentType type ) const; void readConfig( KPIM::GroupwarePrefsBase *newprefs ); void writeConfig( KPIM::GroupwarePrefsBase *newprefs ); @@ -103,7 +103,7 @@ class KDE_EXPORT FolderLister : public QObject /** Adds the folder with the given url and display name to the folder * tree (if is has an appropriate type) */ virtual void processFolderResult( const KURL &href, - const QString &displayName, + const TQString &displayName, KPIM::FolderLister::ContentType type ); /** Retrieve information about the folder u. If it has sub-folders, it descends into the hierarchy */ @@ -136,12 +136,12 @@ class KDE_EXPORT FolderLister : public QObject protected: Type mType; KURL::List mUrls; - QStringList mProcessedPathes; + TQStringList mProcessedPathes; Entry::List mFolders; GroupwareDataAdaptor *mAdaptor; private: // TODO: We need multiple destinations for Events, Tasks and Journals - QMap<KPIM::FolderLister::ContentType, QString> mWriteDestinationId; + TQMap<KPIM::FolderLister::ContentType, TQString> mWriteDestinationId; KURL mOldURL; }; diff --git a/kresources/lib/folderlistview.cpp b/kresources/lib/folderlistview.cpp index 1ab593553..b29e61c9d 100644 --- a/kresources/lib/folderlistview.cpp +++ b/kresources/lib/folderlistview.cpp @@ -30,26 +30,26 @@ #include <kpopupmenu.h> #include <kdebug.h> -#include <qlistview.h> -#include <qheader.h> -#include <qpainter.h> +#include <tqlistview.h> +#include <tqheader.h> +#include <tqpainter.h> static const int BoxSize = 16; //BEGIN FolderListView -FolderListView::FolderListView( QWidget *parent, const QValueList<Property> &types ) +FolderListView::FolderListView( TQWidget *parent, const TQValueList<Property> &types ) : KListView( parent ) { setEnabledTypes( types ); - connect( this, SIGNAL(mouseButtonPressed(int, QListViewItem*, const QPoint&, int)), - this, SLOT(slotMousePressed(int, QListViewItem*, const QPoint&, int)) ); - connect( this, SIGNAL(spacePressed(QListViewItem*)), - this, SLOT(showPopupMenu(QListViewItem*)) ); + connect( this, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), + this, TQT_SLOT(slotMousePressed(int, TQListViewItem*, const TQPoint&, int)) ); + connect( this, TQT_SIGNAL(spacePressed(TQListViewItem*)), + this, TQT_SLOT(showPopupMenu(TQListViewItem*)) ); } -void FolderListView::setEnabledTypes( const QValueList<Property> &types ) +void FolderListView::setEnabledTypes( const TQValueList<Property> &types ) { kdDebug() << "FolderListView::setEnabledTypes" << endl; for ( int i = 0; i< columns(); ++i ) removeColumn( i ); @@ -90,7 +90,7 @@ kdDebug() << "FolderListView::setEnabledTypes" << endl; } else mColumnMap[Unknown] = -1; } -void FolderListView::showPopupMenu( FolderListItem *i, const QPoint &globalPos ) +void FolderListView::showPopupMenu( FolderListItem *i, const TQPoint &globalPos ) { if ( !i ) return; KPIM::FolderLister::Entry folder( i->folder() ); @@ -99,39 +99,39 @@ void FolderListView::showPopupMenu( FolderListItem *i, const QPoint &globalPos ) int id; m.insertTitle( folder.name, 9999 ); - id = m.insertItem( i18n("&Enabled"), this, SLOT(slotPopupHandler(int)), 0, FolderName ); + id = m.insertItem( i18n("&Enabled"), this, TQT_SLOT(slotPopupHandler(int)), 0, FolderName ); m.setItemChecked( id, i->isOn() ); m.insertSeparator(); if ( ( folder.type & KPIM::FolderLister::Event ) && (mTypes.contains( Event ) ) ) { - id = m.insertItem( i18n("Default for New &Events"), this, SLOT(slotPopupHandler(int)), 0, 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 ) ) ) { - id = m.insertItem( i18n("Default for New &Todos"), this, SLOT(slotPopupHandler(int)), 0, 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 ) ) ) { - id = m.insertItem( i18n("Default for New &Journals"), this, SLOT(slotPopupHandler(int)), 0, 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 ) ) ) { - id = m.insertItem( i18n("Default for New &Contacts"), this, SLOT(slotPopupHandler(int)), 0, 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 ) ) ) { - id = m.insertItem( i18n("Default for All New &Items"), this, SLOT(slotPopupHandler(int)), 0, 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 ) ) ) { - id = m.insertItem( i18n("Default for &Unknown New Items"), this, SLOT(slotPopupHandler(int)), 0, Unknown ); + id = m.insertItem( i18n("Default for &Unknown New Items"), this, TQT_SLOT(slotPopupHandler(int)), 0, Unknown ); m.setItemChecked( id, i->isDefault( Unknown ) ); } m.exec( globalPos ); } -void FolderListView::showPopupMenu( QListViewItem *i ) +void FolderListView::showPopupMenu( TQListViewItem *i ) { if ( dynamic_cast<FolderListItem*>(i) ) showPopupMenu( (FolderListItem*)i, viewport()->mapToGlobal(itemRect(i).topLeft()) ); @@ -142,9 +142,9 @@ void FolderListView::slotPopupHandler( int z ) ((FolderListItem*)currentItem())->changeProperty( (Property)z ); } -// Because QListViewItem::activatePos() is going to become deprecated, +// Because TQListViewItem::activatePos() is going to become deprecated, // and also because this attempt offers more control, I connect mousePressed to this. -void FolderListView::slotMousePressed(int btn, QListViewItem* i, const QPoint& pos, int c) +void FolderListView::slotMousePressed(int btn, TQListViewItem* i, const TQPoint& pos, int c) { if ( dynamic_cast<FolderListItem*>(i) ) { if ( btn == Qt::RightButton ) { @@ -152,7 +152,7 @@ void FolderListView::slotMousePressed(int btn, QListViewItem* i, const QPoint& p } 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 ) - QPoint( 0, itemRect(i).top() ) ); + ((FolderListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, itemRect(i).top() ) ); // } else { // KListView::slotMousePressed( btn, i, pos, c ); } @@ -163,10 +163,10 @@ void FolderListView::slotMousePressed(int btn, QListViewItem* i, const QPoint& p //BEGIN FolderListItem -void FolderListItem::activate( int column, const QPoint &localPos ) +void FolderListItem::activate( int column, const TQPoint &localPos ) { if ( !mFolderListView ) return; - QListView *lv = listView(); + TQListView *lv = listView(); int x = 0; for( int c = 0; c < column-1; c++ ) x += lv->columnWidth( c ); @@ -184,7 +184,7 @@ void FolderListItem::activate( int column, const QPoint &localPos ) default: return; } - if ( !QRect( x, 0, w, BoxSize ).contains( localPos ) ) + if ( !TQRect( x, 0, w, BoxSize ).contains( localPos ) ) changeProperty( prop ); } @@ -195,7 +195,7 @@ kdDebug() << "FolderListItem::changeProperty( " << p << ")" << endl; kdDebug() << "it's folderName" << endl; setOn( !isOn() ); } else if ( typeSupported( p ) ) { - QListViewItemIterator it( listView() ); + TQListViewItemIterator it( listView() ); while ( it.current() ) { FolderListItem *item = dynamic_cast<FolderListItem*>( it.current() ); if ( item ) { @@ -233,16 +233,16 @@ void FolderListItem::setDefault( FolderListView::Property prop, bool def ) } -void FolderListItem::paintCell( QPainter *p, const QColorGroup &cg, int col, int width, int align ) +void FolderListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int col, int width, int align ) { if ( !p ) return; - QListView *lv = listView(); + TQListView *lv = listView(); Q_ASSERT( lv ); //### if ( !lv ) return; // use a private color group and set the text/highlighted text colors -// QColorGroup mcg = lv->viewport()->colorGroup(); +// TQColorGroup mcg = lv->viewport()->colorGroup(); FolderListView::Property prop( mFolderListView->typeForColumn(col) ); if ( prop == FolderListView::FolderName ) { @@ -250,11 +250,11 @@ void FolderListItem::paintCell( QPainter *p, const QColorGroup &cg, int col, int super::paintCell( p, cg, col, width, align ); return; } else { - p->fillRect( 0, 0, width, height(), QBrush( cg.base() ) ); + p->fillRect( 0, 0, width, height(), TQBrush( cg.base() ) ); } int marg = lv->itemMargin(); - QColor c; + TQColor c; switch ( prop ) { @@ -271,9 +271,9 @@ void FolderListItem::paintCell( QPainter *p, const QColorGroup &cg, int col, int int y = (height() - BoxSize) / 2; if ( isEnabled() ) - p->setPen( QPen( cg.text(), 1 ) ); + p->setPen( TQPen( cg.text(), 1 ) ); else - p->setPen( QPen( lv->palette().color( QPalette::Disabled, QColorGroup::Text ), 1 ) ); + p->setPen( TQPen( lv->palette().color( TQPalette::Disabled, TQColorGroup::Text ), 1 ) ); p->drawEllipse( x+marg, y+2, BoxSize-4, BoxSize-4 ); @@ -281,7 +281,7 @@ void FolderListItem::paintCell( QPainter *p, const QColorGroup &cg, int col, int if ( isEnabled() ) p->setBrush( cg.text() ); else - p->setBrush( lv->palette().color( QPalette::Disabled, QColorGroup::Text ) ); + p->setBrush( lv->palette().color( TQPalette::Disabled, TQColorGroup::Text ) ); p->drawEllipse( x + marg + 3, y + 5, BoxSize-10, BoxSize-10 ); } break; diff --git a/kresources/lib/folderlistview.h b/kresources/lib/folderlistview.h index d933402a3..e7b634ef6 100644 --- a/kresources/lib/folderlistview.h +++ b/kresources/lib/folderlistview.h @@ -32,7 +32,7 @@ class FolderListCaption; /* - QListView that automatically adds columns for FolderListItems for selecting + TQListView that automatically adds columns for FolderListItems for selecting the default destination and a slot to edit the destinations using the keyboard. */ class FolderListView : public KListView @@ -45,51 +45,51 @@ class FolderListView : public KListView /* mainly for readability */ enum Property { FolderName, Event, Todo, Journal, Contact, All, Unknown, PROP_MAX }; - FolderListView( QWidget *parent, const QValueList<Property> &types = QValueList<Property>() ); + FolderListView( TQWidget *parent, const TQValueList<Property> &types = TQValueList<Property>() ); ~FolderListView() {}; /* Display a popupmenu for item i at the specified global position, eventually with a title, promoting the context name of that item */ - void showPopupMenu( FolderListItem *i, const QPoint &globalPos ); + void showPopupMenu( FolderListItem *i, const TQPoint &globalPos ); void emitChanged() { emit changed(); }; - void setEnabledTypes( const QValueList<Property> &types ); + 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; } private slots: /* Display a popupmenu for item i at item position */ - void showPopupMenu( QListViewItem *i ); + void showPopupMenu( TQListViewItem *i ); /* call item to change a property, or display a menu */ - void slotMousePressed( int, QListViewItem*, const QPoint&, int ); + void slotMousePressed( int, TQListViewItem*, const TQPoint&, int ); /* asks item to change the property in q */ void slotPopupHandler( int z ); signals: void changed(); private: - QValueList<Property> mTypes; - QMap<Property,int> mColumnMap; - QMap<int,Property> mTypeMap; + TQValueList<Property> mTypes; + TQMap<Property,int> mColumnMap; + TQMap<int,Property> mTypeMap; }; /* - QListViewItem subclass to display/edit a folder on a groupware server. + TQListViewItem subclass to display/edit a folder on a groupware server. Selection of default destinations will be done via radio items. */ class FolderListItem : public QCheckListItem { - typedef QCheckListItem super; + typedef TQCheckListItem super; public: FolderListItem( FolderListItem *parent, const KPIM::FolderLister::Entry &folder ) - : QCheckListItem( parent, folder.name, QCheckListItem::CheckBoxController ), + : TQCheckListItem( parent, folder.name, TQCheckListItem::CheckBoxController ), mFolder( folder ), mFolderListView( parent?(parent->folderListView()):0 ) { setOn( mFolder.active ); } FolderListItem( FolderListView *listView, const KPIM::FolderLister::Entry &folder ) - : QCheckListItem( listView, folder.name, - QCheckListItem::CheckBoxController ), mFolder( folder ), mFolderListView( listView ) + : TQCheckListItem( listView, folder.name, + TQCheckListItem::CheckBoxController ), mFolder( folder ), mFolderListView( listView ) { setOn( mFolder.active ); } @@ -100,14 +100,14 @@ class FolderListItem : public QCheckListItem } /* reimp */ -// int width ( const QFontMetrics & fm, const QListView * lv, int c ) const; +// int width ( const TQFontMetrics & fm, const TQListView * lv, int c ) const; bool typeSupported( FolderListView::Property prop ); bool isDefault( FolderListView::Property prop ); void setDefault( FolderListView::Property prop, bool def = true ); /* calls changeProperty() if it makes sense considering pos. */ - void activate( int column, const QPoint &localPos ); + void activate( int column, const TQPoint &localPos ); /* Sets this item as default for property p a */ void changeProperty( FolderListView::Property p ); @@ -115,7 +115,7 @@ class FolderListItem : public QCheckListItem protected: /* reimp */ - void paintCell(QPainter *p, const QColorGroup& cg, int col, int width, int align); + void paintCell(TQPainter *p, const TQColorGroup& cg, int col, int width, int align); private: KPIM::FolderLister::Entry mFolder; diff --git a/kresources/lib/folderselectdialog.cpp b/kresources/lib/folderselectdialog.cpp index 07b8bc8fe..0942f8223 100644 --- a/kresources/lib/folderselectdialog.cpp +++ b/kresources/lib/folderselectdialog.cpp @@ -32,19 +32,19 @@ #include "folderselectdialog.h" -#include <qlayout.h> -#include <qlabel.h> +#include <tqlayout.h> +#include <tqlabel.h> using namespace KPIM; -FolderSelectDialog::FolderSelectDialog( const QString& caption, const QString& label, - const QStringList& list ) +FolderSelectDialog::FolderSelectDialog( const TQString& caption, const TQString& label, + const TQStringList& list ) : KDialogBase(0, 0, true, caption, Ok, Ok, true) { - QFrame* frame = makeMainWidget(); - QVBoxLayout* layout = new QVBoxLayout( frame, 0, spacingHint() ); + TQFrame* frame = makeMainWidget(); + TQVBoxLayout* layout = new TQVBoxLayout( frame, 0, spacingHint() ); - QLabel* labelWidget = new QLabel( label, frame ); + TQLabel* labelWidget = new TQLabel( label, frame ); layout->addWidget( labelWidget ); mListBox = new KListBox( frame ); @@ -53,10 +53,10 @@ FolderSelectDialog::FolderSelectDialog( const QString& caption, const QString& l mListBox->ensureCurrentVisible(); layout->addWidget( mListBox, 10 ); - connect( mListBox, SIGNAL( doubleClicked( QListBoxItem * ) ), - SLOT( slotOk() ) ); - connect( mListBox, SIGNAL( returnPressed( QListBoxItem * ) ), - SLOT( slotOk() ) ); + connect( mListBox, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ), + TQT_SLOT( slotOk() ) ); + connect( mListBox, TQT_SIGNAL( returnPressed( TQListBoxItem * ) ), + TQT_SLOT( slotOk() ) ); mListBox->setFocus(); @@ -65,19 +65,19 @@ FolderSelectDialog::FolderSelectDialog( const QString& caption, const QString& l setMinimumWidth( 320 ); } -QString FolderSelectDialog::getItem( const QString &caption, const QString &label, - const QStringList& list ) +TQString FolderSelectDialog::getItem( const TQString &caption, const TQString &label, + const TQStringList& list ) { FolderSelectDialog dlg( caption, label, list ); - QString result; + TQString result; if ( dlg.exec() == Accepted ) result = dlg.mListBox->currentText(); return result; } -void FolderSelectDialog::closeEvent(QCloseEvent *event) +void FolderSelectDialog::closeEvent(TQCloseEvent *event) { event->ignore(); } diff --git a/kresources/lib/folderselectdialog.h b/kresources/lib/folderselectdialog.h index 2211b6f8f..a7879f9a0 100644 --- a/kresources/lib/folderselectdialog.h +++ b/kresources/lib/folderselectdialog.h @@ -40,15 +40,15 @@ namespace KPIM { class FolderSelectDialog : public KDialogBase { private: - FolderSelectDialog( const QString& caption, const QString& label, - const QStringList& list ); + FolderSelectDialog( const TQString& caption, const TQString& label, + const TQStringList& list ); public: - static QString getItem( const QString& caption, const QString& label, - const QStringList& list ); + static TQString getItem( const TQString& caption, const TQString& label, + const TQStringList& list ); protected: - virtual void closeEvent(QCloseEvent *event); + virtual void closeEvent(TQCloseEvent *event); private: KListBox* mListBox; }; diff --git a/kresources/lib/groupwaredataadaptor.cpp b/kresources/lib/groupwaredataadaptor.cpp index aa83f4674..033ea81de 100644 --- a/kresources/lib/groupwaredataadaptor.cpp +++ b/kresources/lib/groupwaredataadaptor.cpp @@ -37,7 +37,7 @@ KURL GroupwareUploadItem::adaptNewItemUrl( GroupwareDataAdaptor *adaptor, { kdDebug()<<"GroupwareUploadItem::adaptNewItemUrl, baseurl=" << baseurl.url() << endl; if ( adaptor ) { - QString path( adaptor->defaultNewItemName( this ) ); + TQString path( adaptor->defaultNewItemName( this ) ); kdDebug() << "path=" << path << endl; KURL u( baseurl ); if ( path.isEmpty() ) return u; @@ -54,7 +54,7 @@ KIO::TransferJob *GroupwareUploadItem::createRawUploadJob( { Q_ASSERT( adaptor ); if ( !adaptor ) return 0; - const QString dta = data(); + const TQString dta = data(); //kdDebug(7000) << "Uploading: " << data << endl; KURL upUrl( url() ); if ( adaptor ) @@ -77,7 +77,7 @@ kdDebug()<<"GroupwareUploadItem::createUploadNewJob, baseurl=" << baseurl.url() KIO::TransferJob *job = createRawUploadJob( adaptor, baseurl ); if ( job ) { kdDebug() << "Adding If-None-Match " << endl; - QString header; + TQString header; if ( job->outgoingMetaData().contains("customHTTPHeader") ) { header = job->outgoingMetaData()["customHTTPHeader"]; header += "\r\n"; @@ -95,7 +95,7 @@ kdDebug()<<"GroupwareUploadItem::createUploadJob" << endl; KIO::TransferJob *job = createRawUploadJob( adaptor, baseurl ); if ( job && adaptor ) { kdDebug()<<"Adding If-Match header: " << adaptor->idMapper()->fingerprint( uid() ) << endl; - QString header; + TQString header; if ( job->outgoingMetaData().contains("customHTTPHeader") ) { header = job->outgoingMetaData()["customHTTPHeader"]; header += "\r\n"; @@ -110,7 +110,7 @@ kdDebug()<<"new HEADER: " << header << endl; GroupwareDataAdaptor::GroupwareDataAdaptor() - : QObject(), mFolderLister( 0 ), mIdMapper( 0 ) + : TQObject(), mFolderLister( 0 ), mIdMapper( 0 ) { } @@ -153,14 +153,14 @@ kdDebug()<<"GroupwareDataAdaptor::createUploadNewJob, url=" << url.url() << endl } void GroupwareDataAdaptor::processDownloadListItem( const KURL &entry, - const QString &newFingerprint, KPIM::FolderLister::ContentType type ) + const TQString &newFingerprint, KPIM::FolderLister::ContentType type ) { bool download = false; - const QString &location = entry.path(); + const TQString &location = entry.path(); emit itemOnServer( entry ); // if not locally present, download - const QString &localId = idMapper()->localId( location ); + const TQString &localId = idMapper()->localId( location ); kdDebug(5800) << "Looking up remote: " << location << " found: " << localId << endl; if ( localId.isEmpty() || !localItemExists( localId ) ) { @@ -169,7 +169,7 @@ void GroupwareDataAdaptor::processDownloadListItem( const KURL &entry, } else { kdDebug(5800) << "Locally present " << endl; // locally present, let's check if it's newer than what we have - const QString &oldFingerprint = idMapper()->fingerprint( localId ); + const TQString &oldFingerprint = idMapper()->fingerprint( localId ); if ( oldFingerprint != newFingerprint ) { kdDebug(5800) << "Fingerprint changed old: " << oldFingerprint << " new: " << newFingerprint << endl; @@ -190,12 +190,12 @@ void GroupwareDataAdaptor::processDownloadListItem( const KURL &entry, } } -bool GroupwareDataAdaptor::interpretRemoveJob( KIO::Job *job, const QString &/*jobData*/ ) +bool GroupwareDataAdaptor::interpretRemoveJob( KIO::Job *job, const TQString &/*jobData*/ ) { if ( !job ) return false; KIO::DeleteJob *deljob = dynamic_cast<KIO::DeleteJob*>(job); bool error = job->error(); - const QString err = job->errorString(); + const TQString err = job->errorString(); if ( deljob ) { KURL::List urls( deljob->urls() ); @@ -203,8 +203,8 @@ bool GroupwareDataAdaptor::interpretRemoveJob( KIO::Job *job, const QString &/*j if ( error ) { emit itemDeletionError( *it, err ); } else { - // FIXME: Don't use QString::null here - emit itemDeleted( QString::null, *it ); + // FIXME: Don't use TQString::null here + emit itemDeleted( TQString::null, *it ); } } return true; @@ -214,12 +214,12 @@ bool GroupwareDataAdaptor::interpretRemoveJob( KIO::Job *job, const QString &/*j } -bool GroupwareDataAdaptor::interpretUploadJob( KIO::Job *job, const QString &/*jobData*/ ) +bool GroupwareDataAdaptor::interpretUploadJob( KIO::Job *job, const TQString &/*jobData*/ ) { kdDebug(7000) << "GroupwareDataAdaptor::interpretUploadJob " << endl; KIO::TransferJob *trfjob = dynamic_cast<KIO::TransferJob*>(job); bool error = job->error(); - const QString err = job->errorString(); + const TQString err = job->errorString(); if ( trfjob ) { KURL url( trfjob->url() ); @@ -236,13 +236,13 @@ bool GroupwareDataAdaptor::interpretUploadJob( KIO::Job *job, const QString &/*j } } -bool GroupwareDataAdaptor::interpretUploadNewJob( KIO::Job *job, const QString &/*jobData*/ ) +bool GroupwareDataAdaptor::interpretUploadNewJob( KIO::Job *job, const TQString &/*jobData*/ ) { // TODO: How does the incidence mapper know the old/new ids??? kdDebug(7000) << "GroupwareDataAdaptor::interpretUploadNewJob " << endl; KIO::TransferJob *trfjob = dynamic_cast<KIO::TransferJob*>(job); bool error = job->error(); - const QString err = job->errorString(); + const TQString err = job->errorString(); if ( trfjob ) { KURL url( trfjob->url() ); @@ -259,18 +259,18 @@ bool GroupwareDataAdaptor::interpretUploadNewJob( KIO::Job *job, const QString & } } -QString GroupwareDataAdaptor::uidFromJob( KIO::Job *job ) const +TQString GroupwareDataAdaptor::uidFromJob( KIO::Job *job ) const { kdDebug()<<"GroupwareDataAdaptor::uidFromJob( "<<job<<")"<<endl; if ( mJobUIDMap.contains( job ) ) { kdDebug()<<" Contained: "<< mJobUIDMap[job] << endl; return mJobUIDMap[ job ]; } else { - return QString::null; + return TQString::null; } } -void GroupwareDataAdaptor::setUidForJob( KIO::Job *job, const QString &uid ) +void GroupwareDataAdaptor::setUidForJob( KIO::Job *job, const TQString &uid ) { if ( uid.isEmpty() ) { mJobUIDMap.remove( job ); diff --git a/kresources/lib/groupwaredataadaptor.h b/kresources/lib/groupwaredataadaptor.h index 5e7aec49e..52021a07b 100644 --- a/kresources/lib/groupwaredataadaptor.h +++ b/kresources/lib/groupwaredataadaptor.h @@ -26,9 +26,9 @@ #include <groupwareresourcejob.h> #include <folderlister.h> #include <kurl.h> -#include <qstring.h> +#include <tqstring.h> #include <libkcal/listbase.h> -#include <qobject.h> +#include <tqobject.h> #include <kdepimmacros.h> @@ -59,14 +59,14 @@ class KDE_EXPORT GroupwareUploadItem KURL url() const { return mUrl; } void setUrl( const KURL &url ) { mUrl = url; } - QString uid() const { return mUid; } - void setUid( const QString &uid ) { mUid = uid; } + TQString uid() const { return mUid; } + void setUid( const TQString &uid ) { mUid = uid; } - QString fingerprint() const { return mFingerprint; } - void setFingerprint( const QString &fpr ) { mFingerprint = fpr; } + TQString fingerprint() const { return mFingerprint; } + void setFingerprint( const TQString &fpr ) { mFingerprint = fpr; } - virtual QString data() const { return mData; } - virtual void setData( const QString &data ) { mData = data; } + virtual TQString data() const { return mData; } + virtual void setData( const TQString &data ) { mData = data; } virtual KURL adaptNewItemUrl( GroupwareDataAdaptor *adaptor, const KURL &url ); @@ -81,9 +81,9 @@ class KDE_EXPORT GroupwareUploadItem KPIM::FolderLister::ContentType mItemType; private: KURL mUrl; - QString mUid; - QString mData; - QString mFingerprint; + TQString mUid; + TQString mData; + TQString mFingerprint; UploadType mType; }; @@ -108,14 +108,14 @@ Q_OBJECT Set progress message shown by progress manager during download. It will be interpreted as rich text, so it might have to be escaped. */ - void setDownloadProgressMessage( const QString &v ) + void setDownloadProgressMessage( const TQString &v ) { mDownloadProgressMessage = v; } /** Get download progress message. See setDownloadProgressMessage(). */ - QString downloadProgressMessage() const + TQString downloadProgressMessage() const { return mDownloadProgressMessage; } @@ -124,14 +124,14 @@ Q_OBJECT Set progress message shown by progress manager during upload. It will be interpreted as rich text, so it might have to be escaped. */ - void setUploadProgressMessage( const QString &v ) + void setUploadProgressMessage( const TQString &v ) { mUploadProgressMessage = v; } /** Get upload progress message. See setUploadProgressMessage(). */ - QString uploadProgressMessage() const + TQString uploadProgressMessage() const { return mUploadProgressMessage; } @@ -154,14 +154,14 @@ Q_OBJECT /** Set user name. */ - void setUser( const QString &v ) + void setUser( const TQString &v ) { mUser = v; } /** Get user. See setUser(). */ - QString user() const + TQString user() const { return mUser; } @@ -169,14 +169,14 @@ Q_OBJECT /** Set password of user. */ - void setPassword( const QString &v ) + void setPassword( const TQString &v ) { mPassword = v; } /** Get password. See setPassword(). */ - QString password() const + TQString password() const { return mPassword; } @@ -221,24 +221,24 @@ Q_OBJECT virtual void customAdaptUploadUrl( KURL &/*url*/ ) {} /** Return the mime-type expected by the resource. */ - virtual QString mimeType() const = 0; + virtual TQString mimeType() const = 0; /** Identifier of the Resource. Used for the custom fields where resource-specific information is stored. */ - virtual QCString identifier() const = 0; + virtual TQCString identifier() const = 0; /** Returns whether the item with the given localId exists locally. */ - virtual bool localItemExists( const QString &localId ) = 0; + virtual bool localItemExists( const TQString &localId ) = 0; /** Returns whether the item was changed locally since the last download from the server. */ - virtual bool localItemHasChanged( const QString &localId ) = 0; + virtual bool localItemHasChanged( const TQString &localId ) = 0; /** Remove the item from the local cache. */ - virtual void deleteItem( const QString &localId ) = 0; + virtual void deleteItem( const TQString &localId ) = 0; /** Removed the changed flag for the item with the given uid. */ - virtual void clearChange( const QString &uid ) = 0; + virtual void clearChange( const TQString &uid ) = 0; virtual FolderLister::Entry::List defaultFolders(); - virtual QValueList<FolderLister::ContentType> supportedTypes() = 0; + virtual TQValueList<FolderLister::ContentType> supportedTypes() = 0; virtual bool supports( FolderLister::ContentType type ) { return supportedTypes().contains( type ); } @@ -248,13 +248,13 @@ Q_OBJECT /** Creates the KIO::Job for logging in to the server. This is only * called if the GroupwareDataAdaptor::GWResNeedsLogin flag is set * for the resource. */ - virtual KIO::Job *createLoginJob( const KURL &, const QString &/*user*/, - const QString &/*password*/ ) { return 0; } + virtual KIO::Job *createLoginJob( const KURL &, const TQString &/*user*/, + const TQString &/*password*/ ) { return 0; } /** Creates the KIO::Job for logging off the server. This is only * called if the GroupwareDataAdaptor::GWResNeedsLogoff flag is set * for the resource. */ - virtual KIO::Job *createLogoffJob( const KURL &, const QString &/*user*/, - const QString &/*password*/ ) { return 0; } + virtual KIO::Job *createLogoffJob( const KURL &, const TQString &/*user*/, + const TQString &/*password*/ ) { return 0; } /** Creates the KIO::Job for listing all subfolders of the given url. */ virtual KIO::Job *createListFoldersJob ( const KURL & ) = 0; /** Creates the KIO::TransferJob for listing all items in the given url. */ @@ -263,7 +263,7 @@ Q_OBJECT virtual KIO::TransferJob *createDownloadJob( const KURL &, FolderLister::ContentType ) = 0; /** Creates the KIO::TransferJob for downloading a list of items items. */ - virtual KIO::TransferJob *createDownloadJob( const QMap<KURL,FolderLister::ContentType> & ) { return 0; } + virtual KIO::TransferJob *createDownloadJob( const TQMap<KURL,FolderLister::ContentType> & ) { return 0; } /** Create the job to remove the deletedItems from the server. The base URL of the server is passed as uploadurl. */ virtual KIO::Job *createRemoveJob( const KURL &, @@ -298,21 +298,21 @@ Q_OBJECT /** Extract the list of items on the server and the list of items to be downloaded from the results of the job (the job was created by createListitemsJob). */ - virtual bool interpretListItemsJob( KIO::Job *, const QString &jobData ) = 0; - virtual bool interpretDownloadItemsJob( KIO::Job *job, const QString &jobData ) = 0; - virtual bool interpretRemoveJob( KIO::Job *job, const QString &jobData ); - virtual bool interpretUploadJob( KIO::Job *job, const QString &/*jobData*/ ); - virtual bool interpretUploadNewJob( KIO::Job *job, const QString &/*jobData*/ ); + virtual bool interpretListItemsJob( KIO::Job *, const TQString &jobData ) = 0; + virtual bool interpretDownloadItemsJob( KIO::Job *job, const TQString &jobData ) = 0; + virtual bool interpretRemoveJob( KIO::Job *job, const TQString &jobData ); + virtual bool interpretUploadJob( KIO::Job *job, const TQString &/*jobData*/ ); + virtual bool interpretUploadNewJob( KIO::Job *job, const TQString &/*jobData*/ ); virtual void processDownloadListItem( const KURL &entry, - const QString &newFingerprint, KPIM::FolderLister::ContentType type ); + const TQString &newFingerprint, KPIM::FolderLister::ContentType type ); /** Return the default file name for a new item. */ - virtual QString defaultNewItemName( GroupwareUploadItem * ) + virtual TQString defaultNewItemName( GroupwareUploadItem * ) { - return QString::null; + return TQString::null; } - virtual QString uidFromJob( KIO::Job *job ) const; - virtual void setUidForJob( KIO::Job *job, const QString &uid ); + virtual TQString uidFromJob( KIO::Job *job ) const; + virtual void setUidForJob( KIO::Job *job, const TQString &uid ); enum { @@ -328,7 +328,7 @@ Q_OBJECT signals: - void folderInfoRetrieved( const KURL &href, const QString &name, + void folderInfoRetrieved( const KURL &href, const TQString &name, KPIM::FolderLister::ContentType ); void folderSubitemRetrieved( const KURL &, bool isFolder ); @@ -336,26 +336,26 @@ Q_OBJECT /** passed the whole remote url (including hostname) to the receiver */ void itemOnServer( const KURL &remoteURL ); - void itemDownloaded( const QString &localID, const KURL &remoteURL, - const QString &fingerprint ); - void itemDeleted( const QString &localID, const KURL &remoteURL ); - void itemUploaded( const QString &localID, const KURL &remoteURL ); - void itemUploadedNew( const QString &localID, const KURL &remoteURL ); + void itemDownloaded( const TQString &localID, const KURL &remoteURL, + const TQString &fingerprint ); + void itemDeleted( const TQString &localID, const KURL &remoteURL ); + void itemUploaded( const TQString &localID, const KURL &remoteURL ); + void itemUploadedNew( const TQString &localID, const KURL &remoteURL ); - void itemDownloadError( const KURL &remoteURL, const QString &error ); - void itemDeletionError( const KURL &remoteURL, const QString &error ); - void itemUploadError( const KURL &remoteURL, const QString &error ); - void itemUploadNewError( const QString &localID, const QString &error ); + void itemDownloadError( const KURL &remoteURL, const TQString &error ); + void itemDeletionError( const KURL &remoteURL, const TQString &error ); + void itemUploadError( const KURL &remoteURL, const TQString &error ); + void itemUploadNewError( const TQString &localID, const TQString &error ); private: FolderLister *mFolderLister; - QString mDownloadProgressMessage; - QString mUploadProgressMessage; + TQString mDownloadProgressMessage; + TQString mUploadProgressMessage; KURL mBaseURL; - QString mUser; - QString mPassword; + TQString mUser; + TQString mPassword; KPIM::IdMapper *mIdMapper; - QMap<KIO::Job*,QString> mJobUIDMap; + TQMap<KIO::Job*,TQString> mJobUIDMap; }; } diff --git a/kresources/lib/groupwaredownloadjob.cpp b/kresources/lib/groupwaredownloadjob.cpp index 7acc1cd03..7bfa804a7 100644 --- a/kresources/lib/groupwaredownloadjob.cpp +++ b/kresources/lib/groupwaredownloadjob.cpp @@ -59,21 +59,21 @@ void GroupwareDownloadJob::run() mItemsForDownload.clear(); mCurrentlyOnServer.clear(); - connect( adaptor(), SIGNAL( itemToDownload( const KURL &, KPIM::FolderLister::ContentType ) ), - SLOT( slotItemToDownload( const KURL &, KPIM::FolderLister::ContentType ) ) ); - connect( adaptor(), SIGNAL( itemOnServer( const KURL & ) ), - SLOT( slotItemOnServer( const KURL & ) ) ); - connect( adaptor(), SIGNAL( itemDownloaded( const QString &, const KURL &, const QString & ) ), - SLOT( slotItemDownloaded( const QString &, const KURL &, const QString & ) ) ); - connect( adaptor(), SIGNAL( itemDownloadError( const KURL &, const QString & ) ), - SLOT( slotItemDownloadError( const KURL &, const QString & ) ) ); + connect( adaptor(), TQT_SIGNAL( itemToDownload( const KURL &, KPIM::FolderLister::ContentType ) ), + TQT_SLOT( slotItemToDownload( const KURL &, KPIM::FolderLister::ContentType ) ) ); + connect( adaptor(), TQT_SIGNAL( itemOnServer( const KURL & ) ), + TQT_SLOT( slotItemOnServer( const KURL & ) ) ); + connect( adaptor(), TQT_SIGNAL( itemDownloaded( const TQString &, const KURL &, const TQString & ) ), + TQT_SLOT( slotItemDownloaded( const TQString &, const KURL &, const TQString & ) ) ); + connect( adaptor(), TQT_SIGNAL( itemDownloadError( const KURL &, const TQString & ) ), + TQT_SLOT( slotItemDownloadError( const KURL &, const TQString & ) ) ); mProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), adaptor()->downloadProgressMessage() ); connect( mProgress, - SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), - SLOT( cancelLoad() ) ); + TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), + TQT_SLOT( cancelLoad() ) ); listItems(); } @@ -102,18 +102,18 @@ void GroupwareDownloadJob::listItems() kdDebug(5800) << "OpenGroupware::listIncidences(): " << url << endl; - mListItemsData = QString::null; + mListItemsData = TQString::null; mListEventsJob = adaptor()->createListItemsJob( url ); - connect( mListEventsJob, SIGNAL( result( KIO::Job * ) ), - SLOT( slotListItemsResult( KIO::Job * ) ) ); - connect( mListEventsJob, SIGNAL( data( KIO::Job *, const QByteArray & ) ), - SLOT( slotListItemsData( KIO::Job *, const QByteArray & ) ) ); + connect( mListEventsJob, TQT_SIGNAL( result( KIO::Job * ) ), + TQT_SLOT( slotListItemsResult( KIO::Job * ) ) ); + connect( mListEventsJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), + TQT_SLOT( slotListItemsData( KIO::Job *, const TQByteArray & ) ) ); } } -void GroupwareDownloadJob::slotListItemsData( KIO::Job *, const QByteArray &data ) +void GroupwareDownloadJob::slotListItemsData( KIO::Job *, const TQByteArray &data ) { kdDebug(5800) << "OpenGroupware::slotListItemsData()" << endl; @@ -135,7 +135,7 @@ void GroupwareDownloadJob::slotListItemsResult( KIO::Job *job ) adaptor()->interpretListItemsJob( job, mListItemsData ); } - mListItemsData = QString::null; + mListItemsData = TQString::null; mListEventsJob = 0; listItems(); @@ -143,13 +143,13 @@ void GroupwareDownloadJob::slotListItemsResult( KIO::Job *job ) void GroupwareDownloadJob::deleteIncidencesGoneFromServer() { - QMap<QString, QString> remoteIds( adaptor()->idMapper()->remoteIdMap() ); + TQMap<TQString, TQString> remoteIds( adaptor()->idMapper()->remoteIdMap() ); KURL::List::ConstIterator it = mCurrentlyOnServer.begin(); while ( it != mCurrentlyOnServer.end() ) { remoteIds.remove( (*it).path() ); ++it; } - QMap<QString, QString>::ConstIterator it2; + TQMap<TQString, TQString>::ConstIterator it2; for (it2 = remoteIds.begin(); it2 != remoteIds.end(); ++it2) { adaptor()->deleteItem( remoteIds[ it2.key() ] ); } @@ -170,27 +170,27 @@ void GroupwareDownloadJob::downloadItem() success(); } else { if ( adaptor()->flags() & KPIM::GroupwareDataAdaptor::GWResBatchRequest ) { - mDownloadItemsData = QString::null; + mDownloadItemsData = TQString::null; mDownloadJob = adaptor()->createDownloadJob( mItemsForDownload ); mItemsDownloading = mItemsForDownload; mItemsForDownload.clear(); } else { // Download the first item of the list - QMap<KURL,KPIM::FolderLister::ContentType>::Iterator it = mItemsForDownload.begin(); + TQMap<KURL,KPIM::FolderLister::ContentType>::Iterator it = mItemsForDownload.begin(); KURL href( it.key() ); KPIM::FolderLister::ContentType ctype = it.data(); mItemsDownloading.insert( it.key(), it.data() ); mItemsForDownload.remove( it.key() ); adaptor()->adaptDownloadUrl( href ); - mDownloadItemsData = QString::null; + mDownloadItemsData = TQString::null; mDownloadJob = adaptor()->createDownloadJob( href, ctype ); } - connect( mDownloadJob, SIGNAL( result( KIO::Job * ) ), - SLOT( slotDownloadItemResult( KIO::Job * ) ) ); - connect( mDownloadJob, SIGNAL( data( KIO::Job *, const QByteArray & ) ), - SLOT( slotDownloadItemData( KIO::Job *, const QByteArray & ) ) ); + connect( mDownloadJob, TQT_SIGNAL( result( KIO::Job * ) ), + TQT_SLOT( slotDownloadItemResult( KIO::Job * ) ) ); + connect( mDownloadJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), + TQT_SLOT( slotDownloadItemData( KIO::Job *, const TQByteArray & ) ) ); } } @@ -211,17 +211,17 @@ void GroupwareDownloadJob::slotDownloadItemResult( KIO::Job *job ) mProgress->incCompletedItems(); mProgress->updateProgress(); } - mDownloadItemsData = QString::null; + mDownloadItemsData = TQString::null; mDownloadJob = 0; downloadItem(); } -void GroupwareDownloadJob::slotDownloadItemData( KIO::Job *, const QByteArray &data ) +void GroupwareDownloadJob::slotDownloadItemData( KIO::Job *, const TQByteArray &data ) { kdDebug(5800) << "OpenGroupware::slotDownloadItemData()" << endl; - mDownloadItemsData.append( QString::fromUtf8( data.data(), data.size() ) ); + mDownloadItemsData.append( TQString::fromUtf8( data.data(), data.size() ) ); } void GroupwareDownloadJob::slotItemToDownload( const KURL &remoteURL, @@ -246,7 +246,7 @@ kdDebug()<<"GroupwareDownloadJob::slotItemOnServer( " << remoteURL.url() << ")" } -void GroupwareDownloadJob::slotItemDownloadError( const KURL &remoteURL, const QString &/*error*/ ) +void GroupwareDownloadJob::slotItemDownloadError( const KURL &remoteURL, const TQString &/*error*/ ) { // TODO: Error handling! if ( mItemsDownloading.contains( remoteURL ) ) { @@ -257,8 +257,8 @@ void GroupwareDownloadJob::slotItemDownloadError( const KURL &remoteURL, const Q } -void GroupwareDownloadJob::slotItemDownloaded( const QString &localID, - const KURL &remoteURL, const QString &fingerprint ) +void GroupwareDownloadJob::slotItemDownloaded( const TQString &localID, + const KURL &remoteURL, const TQString &fingerprint ) { kdDebug()<<"GroupwareDownloadJob::slotItemDownloaded( " << localID << ", " << remoteURL.url() << ", " << fingerprint << ")" << endl; if ( mItemsForDownload.contains( remoteURL ) ) { diff --git a/kresources/lib/groupwaredownloadjob.h b/kresources/lib/groupwaredownloadjob.h index 236ed3d56..a52413bd2 100644 --- a/kresources/lib/groupwaredownloadjob.h +++ b/kresources/lib/groupwaredownloadjob.h @@ -24,7 +24,7 @@ #define KPIM_GROUPWAREDOWNLOADJOB_H #include "groupwareresourcejob.h" -#include <qstringlist.h> +#include <tqstringlist.h> namespace KIO { class Job; @@ -58,16 +58,16 @@ class GroupwareDownloadJob : public GroupwareJob void cancelLoad(); void slotListItemsResult( KIO::Job * ); - void slotListItemsData( KIO::Job *, const QByteArray & ); + void slotListItemsData( KIO::Job *, const TQByteArray & ); void slotDownloadItemResult( KIO::Job * ); - void slotDownloadItemData( KIO::Job *, const QByteArray & ); + void slotDownloadItemData( KIO::Job *, const TQByteArray & ); void slotItemToDownload( const KURL &remoteURL, KPIM::FolderLister::ContentType type ); void slotItemOnServer( const KURL &remoteURL ); - void slotItemDownloaded( const QString &localID, const KURL &remoteURL, - const QString &fingerprint ); - void slotItemDownloadError( const KURL &remoteURL, const QString &error ); + void slotItemDownloaded( const TQString &localID, const KURL &remoteURL, + const TQString &fingerprint ); + void slotItemDownloadError( const KURL &remoteURL, const TQString &error ); private: KURL::List mFoldersForDownload; @@ -75,18 +75,18 @@ class GroupwareDownloadJob : public GroupwareJob These pathes don't contain the server name! */ KURL::List mCurrentlyOnServer; - QMap<KURL,KPIM::FolderLister::ContentType> mItemsForDownload; - QMap<KURL,KPIM::FolderLister::ContentType> mItemsDownloading; - QMap<KURL,KPIM::FolderLister::ContentType> mItemsDownloaded; - QMap<KURL,KPIM::FolderLister::ContentType> mItemsDownloadError; + TQMap<KURL,KPIM::FolderLister::ContentType> mItemsForDownload; + TQMap<KURL,KPIM::FolderLister::ContentType> mItemsDownloading; + TQMap<KURL,KPIM::FolderLister::ContentType> mItemsDownloaded; + TQMap<KURL,KPIM::FolderLister::ContentType> mItemsDownloadError; KPIM::ProgressItem *mProgress; KIO::TransferJob *mDownloadJob; KIO::TransferJob *mListEventsJob; - QString mListItemsData; - QString mDownloadItemsData; + TQString mListItemsData; + TQString mDownloadItemsData; }; } diff --git a/kresources/lib/groupwareresourcejob.cpp b/kresources/lib/groupwareresourcejob.cpp index 73c102c88..a0094f6a1 100644 --- a/kresources/lib/groupwareresourcejob.cpp +++ b/kresources/lib/groupwareresourcejob.cpp @@ -23,14 +23,14 @@ #include "groupwareresourcejob.h" -#include <qtimer.h> +#include <tqtimer.h> using namespace KPIM; GroupwareJob::GroupwareJob( GroupwareDataAdaptor *adaptor ) : mAdaptor( adaptor ) { - QTimer::singleShot( 0, this, SLOT( run() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( run() ) ); } bool GroupwareJob::error() const @@ -38,18 +38,18 @@ bool GroupwareJob::error() const return !mErrorString.isNull(); } -QString GroupwareJob::errorString() const +TQString GroupwareJob::errorString() const { return mErrorString; } void GroupwareJob::success() { - mErrorString = QString::null; + mErrorString = TQString::null; emit( result( this ) ); } -void GroupwareJob::error( const QString &errorString ) +void GroupwareJob::error( const TQString &errorString ) { mErrorString = errorString; emit( result( this ) ); diff --git a/kresources/lib/groupwareresourcejob.h b/kresources/lib/groupwareresourcejob.h index 2520466ea..76cd2bbcd 100644 --- a/kresources/lib/groupwareresourcejob.h +++ b/kresources/lib/groupwareresourcejob.h @@ -23,8 +23,8 @@ #ifndef KPIM_GROUPWAREJOB_H #define KPIM_GROUPWAREJOB_H -#include <qobject.h> -#include <qstring.h> +#include <tqobject.h> +#include <tqstring.h> #include "folderlister.h" namespace KPIM { @@ -42,7 +42,7 @@ class GroupwareJob : public QObject GroupwareJob( GroupwareDataAdaptor *adaptor ); bool error() const; - QString errorString() const; + TQString errorString() const; virtual void kill() = 0; @@ -51,7 +51,7 @@ class GroupwareJob : public QObject protected: void success(); - void error( const QString & ); + void error( const TQString & ); GroupwareDataAdaptor *adaptor() { return mAdaptor; } const GroupwareDataAdaptor *adaptor() const { return mAdaptor; } @@ -59,7 +59,7 @@ class GroupwareJob : public QObject virtual void run() = 0; private: - QString mErrorString; + TQString mErrorString; GroupwareDataAdaptor *mAdaptor; }; diff --git a/kresources/lib/groupwareuploadjob.cpp b/kresources/lib/groupwareuploadjob.cpp index bb3098fc2..e4d6cb131 100644 --- a/kresources/lib/groupwareuploadjob.cpp +++ b/kresources/lib/groupwareuploadjob.cpp @@ -33,8 +33,8 @@ #include <kurl.h> #include <kio/job.h> -#include <qstringlist.h> -#include <qtimer.h> +#include <tqstringlist.h> +#include <tqtimer.h> #include <klocale.h> using namespace KPIM; @@ -52,22 +52,22 @@ void GroupwareUploadJob::run() KPIM::ProgressManager::getUniqueID(), adaptor()->uploadProgressMessage() ); connect( mUploadProgress, - SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), - SLOT( cancelSave() ) ); + TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), + TQT_SLOT( cancelSave() ) ); - connect( adaptor(), SIGNAL( itemDeletionError( const KURL &, const QString & ) ), - SLOT( slotItemDeleteError( const KURL &, const QString & ) ) ); - connect( adaptor(), SIGNAL( itemUploadError( const KURL &, const QString & ) ), - SLOT( slotItemUploadError( const KURL &, const QString & ) ) ); - connect( adaptor(), SIGNAL( itemUploadNewError( const QString &, const QString & ) ), - SLOT( slotItemUploadNewError( const QString &, const QString & ) ) ); + connect( adaptor(), TQT_SIGNAL( itemDeletionError( const KURL &, const TQString & ) ), + TQT_SLOT( slotItemDeleteError( const KURL &, const TQString & ) ) ); + connect( adaptor(), TQT_SIGNAL( itemUploadError( const KURL &, const TQString & ) ), + TQT_SLOT( slotItemUploadError( const KURL &, const TQString & ) ) ); + connect( adaptor(), TQT_SIGNAL( itemUploadNewError( const TQString &, const TQString & ) ), + TQT_SLOT( slotItemUploadNewError( const TQString &, const TQString & ) ) ); - connect( adaptor(), SIGNAL( itemDeleted( const QString &, const KURL & ) ), - SLOT( slotItemDeleted( const QString &, const KURL & ) ) ); - connect( adaptor(), SIGNAL( itemUploaded( const QString &, const KURL & ) ), - SLOT( slotItemUploaded( const QString &, const KURL & ) ) ); - connect( adaptor(), SIGNAL( itemUploadedNew( const QString &, const KURL& ) ), - SLOT( slotItemUploadedNew( const QString &, const KURL & ) ) ); + connect( adaptor(), TQT_SIGNAL( itemDeleted( const TQString &, const KURL & ) ), + TQT_SLOT( slotItemDeleted( const TQString &, const KURL & ) ) ); + connect( adaptor(), TQT_SIGNAL( itemUploaded( const TQString &, const KURL & ) ), + TQT_SLOT( slotItemUploaded( const TQString &, const KURL & ) ) ); + connect( adaptor(), TQT_SIGNAL( itemUploadedNew( const TQString &, const KURL& ) ), + TQT_SLOT( slotItemUploadedNew( const TQString &, const KURL & ) ) ); mUploadProgress->setTotalItems( mAddedItems.size() + mChangedItems.size() + @@ -81,7 +81,7 @@ void GroupwareUploadJob::deleteItem() { kdDebug(5800)<<"GroupwareUploadJob::deleteItem()"<<endl; if ( mDeletedItems.isEmpty() ) { - QTimer::singleShot( 0, this, SLOT( uploadItem() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( uploadItem() ) ); } else { kdDebug(7000) << " Deleting " << mDeletedItems.size() << " items from the server " << endl; @@ -101,11 +101,11 @@ kdDebug() << "Not using batch delete " << endl; } if ( mDeletionJob ) { - mDeletionJobData = QString::null; - connect( mDeletionJob, SIGNAL( result( KIO::Job* ) ), - SLOT( slotDeletionJobResult( KIO::Job* ) ) ); -// connect( mDeletionJob, SIGNAL( data( KIO::Job *, const QByteArray & ) ), -// SLOT( slotDeletionJobData( KIO::Job *, const QByteArray & ) ) ); + mDeletionJobData = TQString::null; + connect( mDeletionJob, TQT_SIGNAL( result( KIO::Job* ) ), + TQT_SLOT( slotDeletionJobResult( KIO::Job* ) ) ); +// connect( mDeletionJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), +// TQT_SLOT( slotDeletionJobData( KIO::Job *, const TQByteArray & ) ) ); } else { deleteItem(); } @@ -114,7 +114,7 @@ kdDebug() << "Not using batch delete " << endl; -void GroupwareUploadJob::slotDeletionJobData( KIO::Job *, const QByteArray &data ) +void GroupwareUploadJob::slotDeletionJobData( KIO::Job *, const TQByteArray &data ) { kdDebug(5800) << "OpenGroupware::slotDeletionData()" << endl; @@ -129,7 +129,7 @@ void GroupwareUploadJob::slotDeletionJobResult( KIO::Job *job ) adaptor()->interpretRemoveJob( job, mDeletionJobData ); } mDeletionJob = 0; - QTimer::singleShot( 0, this, SLOT( deleteItem() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( deleteItem() ) ); } @@ -138,7 +138,7 @@ void GroupwareUploadJob::uploadItem() { kdDebug(5800)<<"GroupwareUploadJob::uploadItem()"<<endl; if ( mChangedItems.isEmpty() ) { - QTimer::singleShot( 0, this, SLOT( uploadNewItem() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( uploadNewItem() ) ); } else { kdDebug(5800)<<"We still have "<<mChangedItems.count()<<" changed items to upload"<<endl; @@ -158,11 +158,11 @@ kdDebug() << "Not using batch upload " << endl; } if ( mUploadJob ) { - mUploadJobData = QString::null; - connect( mUploadJob, SIGNAL( result( KIO::Job* ) ), - SLOT( slotUploadJobResult( KIO::Job* ) ) ); - connect( mUploadJob, SIGNAL( data( KIO::Job *, const QByteArray & ) ), - SLOT( slotUploadJobData( KIO::Job *, const QByteArray & ) ) ); + mUploadJobData = TQString::null; + connect( mUploadJob, TQT_SIGNAL( result( KIO::Job* ) ), + TQT_SLOT( slotUploadJobResult( KIO::Job* ) ) ); + connect( mUploadJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), + TQT_SLOT( slotUploadJobData( KIO::Job *, const TQByteArray & ) ) ); } else { uploadItem(); } @@ -170,7 +170,7 @@ kdDebug() << "Not using batch upload " << endl; } -void GroupwareUploadJob::slotUploadJobData( KIO::Job *, const QByteArray &data ) +void GroupwareUploadJob::slotUploadJobData( KIO::Job *, const TQByteArray &data ) { kdDebug(5800) << "OpenGroupware::slotUploadData()" << endl; @@ -185,7 +185,7 @@ void GroupwareUploadJob::slotUploadJobResult( KIO::Job *job ) adaptor()->interpretUploadJob( job, mUploadJobData ); } mUploadJob = 0; - QTimer::singleShot( 0, this, SLOT( uploadItem() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( uploadItem() ) ); } @@ -216,11 +216,11 @@ kdDebug() << "Not using batch create to " << url.url() << " for item of type " < } if ( mUploadJob ) { - mUploadNewJobData = QString::null; - connect( mUploadJob, SIGNAL( result( KIO::Job* ) ), - SLOT( slotUploadNewJobResult( KIO::Job* ) ) ); - connect( mUploadJob, SIGNAL( data( KIO::Job *, const QByteArray & ) ), - SLOT( slotUploadNewJobData( KIO::Job *, const QByteArray & ) ) ); + mUploadNewJobData = TQString::null; + connect( mUploadJob, TQT_SIGNAL( result( KIO::Job* ) ), + TQT_SLOT( slotUploadNewJobResult( KIO::Job* ) ) ); + connect( mUploadJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), + TQT_SLOT( slotUploadNewJobData( KIO::Job *, const TQByteArray & ) ) ); } else { uploadNewItem(); } @@ -231,7 +231,7 @@ kdDebug() << "Not using batch create to " << url.url() << " for item of type " < } } -void GroupwareUploadJob::slotUploadNewJobData( KIO::Job *, const QByteArray &data ) +void GroupwareUploadJob::slotUploadNewJobData( KIO::Job *, const TQByteArray &data ) { kdDebug(5800) << "OpenGroupware::slotUploadNewJobData()" << endl; @@ -246,7 +246,7 @@ void GroupwareUploadJob::slotUploadNewJobResult( KIO::Job *job ) adaptor()->interpretUploadNewJob( job, mUploadNewJobData ); } mUploadJob = 0; - QTimer::singleShot( 0, this, SLOT( uploadNewItem() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( uploadNewItem() ) ); } @@ -255,12 +255,12 @@ void GroupwareUploadJob::kill() cancelSave(); } -void GroupwareUploadJob::slotItemDeleted( const QString &/*localId*/, const KURL &remoteURL ) +void GroupwareUploadJob::slotItemDeleted( const TQString &/*localId*/, const KURL &remoteURL ) { kdDebug() << "GroupwareUploadJob::slotItemDeleted, removal successful: "<< remoteURL.url() << endl; - const QString &remote = remoteURL.path(); - const QString &local = adaptor()->idMapper()->localId( remote ); + const TQString &remote = remoteURL.path(); + const TQString &local = adaptor()->idMapper()->localId( remote ); if ( !local.isEmpty() ) { // TODO: Is the deleted status reset in the resource? adaptor()->deleteItem( local ); @@ -290,12 +290,12 @@ kdDebug()<<"Found it in the list!"<<endl; -void GroupwareUploadJob::slotItemUploaded( const QString &/*localId*/, const KURL &remoteURL ) +void GroupwareUploadJob::slotItemUploaded( const TQString &/*localId*/, const KURL &remoteURL ) { kdDebug() << "GroupwareUploadJob::slotItemUploaded, upload successful: "<< remoteURL.url() << endl; - const QString &remote = remoteURL.path(); - const QString &local = adaptor()->idMapper()->localId( remote ); + const TQString &remote = remoteURL.path(); + const TQString &local = adaptor()->idMapper()->localId( remote ); if ( !local.isEmpty() ) { // TODO: Is the deleted status reset in the resource? // adaptor()->itemUploaded( local, remoteURL ); @@ -327,14 +327,14 @@ kdDebug()<<"Found it in the list!"<<endl; } -void GroupwareUploadJob::slotItemUploadedNew( const QString &localId, const KURL &remoteURL ) +void GroupwareUploadJob::slotItemUploadedNew( const TQString &localId, const KURL &remoteURL ) { kdDebug() << "GroupwareUploadJob::slotItemUploadedNew, upload successful: "<< remoteURL.url() << endl; - const QString &remote = remoteURL.path(); + const TQString &remote = remoteURL.path(); // TODO: For a new item this won't return anything, so we need to insert the // local<=>remote id map when creating the upload job... And maybe - const QString &local = adaptor()->idMapper()->localId( remote ); + const TQString &local = adaptor()->idMapper()->localId( remote ); if ( !localId.isEmpty() ) { adaptor()->deleteItem( localId ); } @@ -367,7 +367,7 @@ kdDebug()<<"Found it in the list!"<<endl; } } -void GroupwareUploadJob::slotItemDeleteError( const KURL &remoteURL, const QString &/*error*/ ) +void GroupwareUploadJob::slotItemDeleteError( const KURL &remoteURL, const TQString &/*error*/ ) { // TODO: Add to error list, remove from uploading and toUpload list kdDebug() << "GroupwareUploadJob::slotItemDeleteError, removal not successful: "<< remoteURL.url() << endl; @@ -393,7 +393,7 @@ kdDebug()<<"Found it in the list!"<<endl; } } -void GroupwareUploadJob::slotItemUploadError( const KURL &remoteURL, const QString &/*error*/ ) +void GroupwareUploadJob::slotItemUploadError( const KURL &remoteURL, const TQString &/*error*/ ) { // TODO: Add to error list, remove from uploading and toUpload list kdDebug() << "GroupwareUploadJob::slotItemUploadError, removal not successful: "<< remoteURL.url() << endl; @@ -419,7 +419,7 @@ kdDebug()<<"Found it in the list!"<<endl; } } -void GroupwareUploadJob::slotItemUploadNewError( const QString &/*localID*/, const QString &remoteURL ) +void GroupwareUploadJob::slotItemUploadNewError( const TQString &/*localID*/, const TQString &remoteURL ) { kdDebug(5006) << "GroupwareUploadJob::slotItemUploadNewError, removal not successful: "<< remoteURL << endl; KPIM::GroupwareUploadItem::List allit( mAddedItems ); diff --git a/kresources/lib/groupwareuploadjob.h b/kresources/lib/groupwareuploadjob.h index de87680f4..5edbca9b4 100644 --- a/kresources/lib/groupwareuploadjob.h +++ b/kresources/lib/groupwareuploadjob.h @@ -26,7 +26,7 @@ #include "groupwareresourcejob.h" #include <kurl.h> -#include <qstringlist.h> +#include <tqstringlist.h> #include <groupwaredataadaptor.h> namespace KIO { @@ -88,19 +88,19 @@ class GroupwareUploadJob : public GroupwareJob void cancelSave(); void slotDeletionJobResult( KIO::Job *job ); - void slotDeletionJobData( KIO::Job *, const QByteArray & ); + void slotDeletionJobData( KIO::Job *, const TQByteArray & ); void slotUploadJobResult( KIO::Job *job ); - void slotUploadJobData( KIO::Job *, const QByteArray & ); + void slotUploadJobData( KIO::Job *, const TQByteArray & ); void slotUploadNewJobResult( KIO::Job *job ); - void slotUploadNewJobData( KIO::Job *, const QByteArray & ); + void slotUploadNewJobData( KIO::Job *, const TQByteArray & ); - void slotItemDeleted( const QString &localID, const KURL &remoteURL ); - void slotItemUploaded( const QString &localID, const KURL &remoteURL ); - void slotItemUploadedNew( const QString &localID, const KURL &remoteURL ); + void slotItemDeleted( const TQString &localID, const KURL &remoteURL ); + void slotItemUploaded( const TQString &localID, const KURL &remoteURL ); + void slotItemUploadedNew( const TQString &localID, const KURL &remoteURL ); - void slotItemDeleteError( const KURL &remoteURL, const QString &error ); - void slotItemUploadError( const KURL &remoteURL, const QString &error ); - void slotItemUploadNewError( const QString &localID, const QString &error ); + void slotItemDeleteError( const KURL &remoteURL, const TQString &error ); + void slotItemUploadError( const KURL &remoteURL, const TQString &error ); + void slotItemUploadNewError( const TQString &localID, const TQString &error ); void uploadCompleted(); @@ -113,9 +113,9 @@ class GroupwareUploadJob : public GroupwareJob KPIM::GroupwareUploadItem::List mItemsUploaded; KPIM::GroupwareUploadItem::List mItemsUploadError; - QString mDeletionJobData; - QString mUploadJobData; - QString mUploadNewJobData; + TQString mDeletionJobData; + TQString mUploadJobData; + TQString mUploadNewJobData; KIO::TransferJob *mUploadJob; KIO::Job *mDeletionJob; diff --git a/kresources/lib/kabc_resourcegroupwarebase.cpp b/kresources/lib/kabc_resourcegroupwarebase.cpp index f087f4849..8af4cf837 100644 --- a/kresources/lib/kabc_resourcegroupwarebase.cpp +++ b/kresources/lib/kabc_resourcegroupwarebase.cpp @@ -177,8 +177,8 @@ bool ResourceGroupwareBase::asyncLoad() loadCache(); mDownloadJob = createDownloadJob( mAdaptor ); - connect( mDownloadJob, SIGNAL( result( KPIM::GroupwareJob * ) ), - SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) ); + connect( mDownloadJob, TQT_SIGNAL( result( KPIM::GroupwareJob * ) ), + TQT_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) ); return true; } @@ -212,8 +212,8 @@ bool ResourceGroupwareBase::asyncSave( Ticket* ) } mUploadJob = createUploadJob( mAdaptor ); - connect( mUploadJob, SIGNAL( result( KPIM::GroupwareJob * ) ), - SLOT( slotUploadJobResult( KPIM::GroupwareJob * ) ) ); + connect( mUploadJob, TQT_SIGNAL( result( KPIM::GroupwareJob * ) ), + TQT_SLOT( slotUploadJobResult( KPIM::GroupwareJob * ) ) ); KABC::Addressee::List addr; KABC::Addressee::List::Iterator it; diff --git a/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp b/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp index 47b17ced5..803037342 100644 --- a/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp +++ b/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp @@ -32,43 +32,43 @@ #include <klineedit.h> #include <kurlrequester.h> -#include <qlabel.h> -#include <qlayout.h> +#include <tqlabel.h> +#include <tqlayout.h> using namespace KABC; -ResourceGroupwareBaseConfig::ResourceGroupwareBaseConfig( QWidget* parent, const char* name ) +ResourceGroupwareBaseConfig::ResourceGroupwareBaseConfig( TQWidget* parent, const char* name ) : KRES::ConfigWidget( parent, name ) { - QGridLayout *mainLayout = new QGridLayout( this, 7, 2, 0, KDialog::spacingHint() ); + TQGridLayout *mainLayout = new TQGridLayout( this, 7, 2, 0, KDialog::spacingHint() ); - QLabel *label = new QLabel( i18n( "URL:" ), this ); + TQLabel *label = new TQLabel( i18n( "URL:" ), this ); mURL = new KURLRequester( this ); mainLayout->addWidget( label, 0, 0 ); mainLayout->addWidget( mURL, 0, 1 ); - label = new QLabel( i18n( "User:" ), this ); + label = new TQLabel( i18n( "User:" ), this ); mUser = new KLineEdit( this ); mainLayout->addWidget( label, 1, 0 ); mainLayout->addWidget( mUser, 1, 1 ); - label = new QLabel( i18n( "Password:" ), this ); + label = new TQLabel( i18n( "Password:" ), this ); mPassword = new KLineEdit( this ); - mPassword->setEchoMode( QLineEdit::Password ); + mPassword->setEchoMode( TQLineEdit::Password ); mainLayout->addWidget( label, 2, 0 ); mainLayout->addWidget( mPassword, 2, 1 ); - QFrame *hline = new QFrame( this ); - hline->setFrameStyle( QFrame::HLine | QFrame::Sunken ); + TQFrame *hline = new TQFrame( this ); + hline->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); mainLayout->addMultiCellWidget( hline, 3, 3, 0, 1 ); mFolderConfig = new KPIM::FolderConfig( this ); - connect( mFolderConfig, SIGNAL( updateFoldersClicked() ), - SLOT( updateFolders() ) ); + connect( mFolderConfig, TQT_SIGNAL( updateFoldersClicked() ), + TQT_SLOT( updateFolders() ) ); mainLayout->addMultiCellWidget( mFolderConfig, 4, 4, 0, 1 ); } diff --git a/kresources/lib/kabc_resourcegroupwarebaseconfig.h b/kresources/lib/kabc_resourcegroupwarebaseconfig.h index ba2ae1715..68e8fc0af 100644 --- a/kresources/lib/kabc_resourcegroupwarebaseconfig.h +++ b/kresources/lib/kabc_resourcegroupwarebaseconfig.h @@ -41,7 +41,7 @@ class KDE_EXPORT ResourceGroupwareBaseConfig : public KRES::ConfigWidget Q_OBJECT public: - ResourceGroupwareBaseConfig( QWidget* parent = 0, const char* name = 0 ); + ResourceGroupwareBaseConfig( TQWidget* parent = 0, const char* name = 0 ); public slots: void loadSettings( KRES::Resource* ); diff --git a/kresources/lib/kcal_cachesettingsdlg.cpp b/kresources/lib/kcal_cachesettingsdlg.cpp index ea89dfa5d..808a16734 100644 --- a/kresources/lib/kcal_cachesettingsdlg.cpp +++ b/kresources/lib/kcal_cachesettingsdlg.cpp @@ -32,19 +32,19 @@ #include <klineedit.h> #include <kdialog.h> -#include <qlabel.h> -#include <qlayout.h> +#include <tqlabel.h> +#include <tqlayout.h> using namespace KCal; -CacheSettingsDialog::CacheSettingsDialog( QWidget* parent, const char* name ) +CacheSettingsDialog::CacheSettingsDialog( TQWidget* parent, const char* name ) : KDialogBase( parent, name, true, i18n("Resource Cache Settings"), KDialogBase::Close ) { - QWidget *mainWidget = new QWidget( this ); + TQWidget *mainWidget = new TQWidget( this ); setMainWidget( mainWidget ); - QGridLayout *mainLayout = new QGridLayout( mainWidget, 2, 2 ); + TQGridLayout *mainLayout = new TQGridLayout( mainWidget, 2, 2 ); mainLayout->setSpacing( KDialog::spacingHint() ); mReloadConfig = new KCal::ResourceCachedReloadConfig( mainWidget ); diff --git a/kresources/lib/kcal_cachesettingsdlg.h b/kresources/lib/kcal_cachesettingsdlg.h index 71ec6de28..e50b2cad4 100644 --- a/kresources/lib/kcal_cachesettingsdlg.h +++ b/kresources/lib/kcal_cachesettingsdlg.h @@ -43,7 +43,7 @@ class KDE_EXPORT CacheSettingsDialog : public KDialogBase { Q_OBJECT public: - CacheSettingsDialog( QWidget *parent = 0, const char *name = 0 ); + CacheSettingsDialog( TQWidget *parent = 0, const char *name = 0 ); public slots: virtual void loadSettings( KRES::Resource *resource ); diff --git a/kresources/lib/kcal_resourcegroupwarebase.cpp b/kresources/lib/kcal_resourcegroupwarebase.cpp index aaf471218..7499b224d 100644 --- a/kresources/lib/kcal_resourcegroupwarebase.cpp +++ b/kresources/lib/kcal_resourcegroupwarebase.cpp @@ -34,7 +34,7 @@ #include <kio/job.h> #include <klocale.h> -#include <qapplication.h> +#include <tqapplication.h> using namespace KCal; @@ -195,8 +195,8 @@ bool ResourceGroupwareBase::doOpen() return false; } else { mLoginFinished = false; - connect( loginJob, SIGNAL( result( KIO::Job * ) ), - SLOT( slotLoginJobResult( KIO::Job* ) ) ); + connect( loginJob, TQT_SIGNAL( result( KIO::Job * ) ), + TQT_SLOT( slotLoginJobResult( KIO::Job* ) ) ); enter_loop(); return mLoginFinished; } @@ -211,13 +211,13 @@ bool ResourceGroupwareBase::doOpen() // Copyright (C) 1998 Matthias Ettrich (ettrich@kde.org) // Copyright (C) 1999 David Faure (faure@kde.org) // If a troll sees this, he kills me -void qt_enter_modal( QWidget *widget ); -void qt_leave_modal( QWidget *widget ); +void qt_enter_modal( TQWidget *widget ); +void qt_leave_modal( TQWidget *widget ); void ResourceGroupwareBase::enter_loop() { - QWidget dummy(0,0,WType_Dialog | WShowModal); - dummy.setFocusPolicy( QWidget::NoFocus ); + TQWidget dummy(0,0,WType_Dialog | WShowModal); + dummy.setFocusPolicy( TQWidget::NoFocus ); qt_enter_modal(&dummy); qApp->enter_loop(); qt_leave_modal(&dummy); @@ -239,8 +239,8 @@ void ResourceGroupwareBase::doClose() if ( adaptor() && adaptor()->flags() & KPIM::GroupwareDataAdaptor::GWResNeedsLogoff ) { KIO::Job *logoffJob = adaptor()->createLogoffJob( prefs()->url(), prefs()->user(), prefs()->password() ); - connect( logoffJob, SIGNAL( result( KIO::Job * ) ), - SLOT( slotLogoffJobResult( KIO::Job* ) ) ); + connect( logoffJob, TQT_SIGNAL( result( KIO::Job * ) ), + TQT_SLOT( slotLogoffJobResult( KIO::Job* ) ) ); // TODO: Do we really need to block while waiting for the job to return? enter_loop(); } @@ -276,8 +276,8 @@ bool ResourceGroupwareBase::doLoad() emit resourceChanged( this ); mDownloadJob = createDownloadJob( adaptor() ); - connect( mDownloadJob, SIGNAL( result( KPIM::GroupwareJob * ) ), - SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) ); + connect( mDownloadJob, TQT_SIGNAL( result( KPIM::GroupwareJob * ) ), + TQT_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) ); return true; } @@ -322,8 +322,8 @@ bool ResourceGroupwareBase::doSave() if ( !confirmSave() ) return false; mUploadJob = createUploadJob( adaptor() ); - connect( mUploadJob, SIGNAL( result( KPIM::GroupwareJob * ) ), - SLOT( slotUploadJobResult( KPIM::GroupwareJob * ) ) ); + connect( mUploadJob, TQT_SIGNAL( result( KPIM::GroupwareJob * ) ), + TQT_SLOT( slotUploadJobResult( KPIM::GroupwareJob * ) ) ); Incidence::List inc; Incidence::List::Iterator it; @@ -376,8 +376,8 @@ void ResourceGroupwareBase::slotUploadJobResult( KPIM::GroupwareJob *job ) if ( !mDownloadJob ) { mDownloadJob = createDownloadJob( adaptor() ); - connect( mDownloadJob, SIGNAL( result( KPIM::GroupwareJob * ) ), - SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) ); + connect( mDownloadJob, TQT_SIGNAL( result( KPIM::GroupwareJob * ) ), + TQT_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) ); } else { kdWarning() << k_funcinfo << "Download still in progress. " "Can't happen. (TM)" << endl; @@ -399,7 +399,7 @@ bool ResourceGroupwareBase::confirmSave() dlg.addIncidences( deletedIncidences(), i18n("Deleted") ); int result = dlg.exec(); - return result == QDialog::Accepted; + return result == TQDialog::Accepted; } KABC::Lock *ResourceGroupwareBase::lock() diff --git a/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp b/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp index 2b4bc81be..9ae91a0d8 100644 --- a/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp +++ b/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp @@ -35,48 +35,48 @@ #include <kdialog.h> #include <kpushbutton.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qhbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqhbox.h> using namespace KCal; -ResourceGroupwareBaseConfig::ResourceGroupwareBaseConfig( QWidget* parent, +ResourceGroupwareBaseConfig::ResourceGroupwareBaseConfig( TQWidget* parent, const char* name ) : KRES::ConfigWidget( parent, name ) { resize( 245, 115 ); - QGridLayout *mainLayout = new QGridLayout( this, 2, 2 ); + TQGridLayout *mainLayout = new TQGridLayout( this, 2, 2 ); mainLayout->setSpacing( KDialog::spacingHint() ); - QLabel *label = new QLabel( i18n("URL:"), this ); + TQLabel *label = new TQLabel( i18n("URL:"), this ); mainLayout->addWidget( label, 1, 0 ); mUrl = new KLineEdit( this ); mainLayout->addWidget( mUrl, 1, 1 ); - label = new QLabel( i18n("User:"), this ); + label = new TQLabel( i18n("User:"), this ); mainLayout->addWidget( label, 2, 0 ); mUserEdit = new KLineEdit( this ); mainLayout->addWidget( mUserEdit, 2, 1 ); - label = new QLabel( i18n("Password:"), this ); + label = new TQLabel( i18n("Password:"), this ); mainLayout->addWidget( label, 3, 0 ); mPasswordEdit = new KLineEdit( this ); mainLayout->addWidget( mPasswordEdit, 3, 1 ); mPasswordEdit->setEchoMode( KLineEdit::Password ); mFolderConfig = new KPIM::FolderConfig( this ); - connect( mFolderConfig, SIGNAL( updateFoldersClicked() ), - SLOT( updateFolders() ) ); + connect( mFolderConfig, TQT_SIGNAL( updateFoldersClicked() ), + TQT_SLOT( updateFolders() ) ); mainLayout->addMultiCellWidget( mFolderConfig, 4, 4, 0, 1 ); - QHBox *hBox = new QHBox( this ); + TQHBox *hBox = new TQHBox( this ); mCacheSettingsButton = new KPushButton( i18n("Configure Cache Settings..."), hBox ); mainLayout->addMultiCellWidget( hBox, 5, 5, 0, 1 ); - connect( mCacheSettingsButton, SIGNAL( clicked() ), - SLOT( showCacheSettings() ) ); + connect( mCacheSettingsButton, TQT_SIGNAL( clicked() ), + TQT_SLOT( showCacheSettings() ) ); mCacheDialog = new CacheSettingsDialog( this ); } diff --git a/kresources/lib/kcal_resourcegroupwarebaseconfig.h b/kresources/lib/kcal_resourcegroupwarebaseconfig.h index a88afbc56..61e71b370 100644 --- a/kresources/lib/kcal_resourcegroupwarebaseconfig.h +++ b/kresources/lib/kcal_resourcegroupwarebaseconfig.h @@ -48,7 +48,7 @@ class KDE_EXPORT ResourceGroupwareBaseConfig : public KRES::ConfigWidget { Q_OBJECT public: - ResourceGroupwareBaseConfig( QWidget *parent = 0, const char *name = 0 ); + ResourceGroupwareBaseConfig( TQWidget *parent = 0, const char *name = 0 ); public slots: virtual void loadSettings( KRES::Resource *resource ); diff --git a/kresources/lib/webdavhandler.cpp b/kresources/lib/webdavhandler.cpp index e6c0a4937..fcf99a145 100644 --- a/kresources/lib/webdavhandler.cpp +++ b/kresources/lib/webdavhandler.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> -#include <qdatetime.h> +#include <tqdatetime.h> extern "C" { #include <ical.h> @@ -56,39 +56,39 @@ KURL WebdavHandler::toDAV( const KURL& url ) -QDomElement WebdavHandler::addElement( QDomDocument &doc, QDomNode &node, - const QString &tag, const QString &value ) +TQDomElement WebdavHandler::addElement( TQDomDocument &doc, TQDomNode &node, + const TQString &tag, const TQString &value ) { - QDomElement el = doc.createElement( tag ); + TQDomElement el = doc.createElement( tag ); node.appendChild( el ); if ( !value.isNull() ) { - QDomText txt = doc.createTextNode( value ); + TQDomText txt = doc.createTextNode( value ); el.appendChild( txt ); } return el; } -QDomElement WebdavHandler::addElementNS( QDomDocument &doc, QDomNode &node, - const QString &ns, const QString &tag, const QString &value ) +TQDomElement WebdavHandler::addElementNS( TQDomDocument &doc, TQDomNode &node, + const TQString &ns, const TQString &tag, const TQString &value ) { - QDomElement el = doc.createElementNS( ns, tag ); + TQDomElement el = doc.createElementNS( ns, tag ); node.appendChild( el ); if ( !value.isNull() ) { - QDomText txt = doc.createTextNode( value ); + TQDomText txt = doc.createTextNode( value ); el.appendChild( txt ); } return el; } -QDomElement WebdavHandler::addDavElement( QDomDocument &doc, QDomNode &node, - const QString &tag, const QString &value ) +TQDomElement WebdavHandler::addDavElement( TQDomDocument &doc, TQDomNode &node, + const TQString &tag, const TQString &value ) { return addElementNS( doc, node, "DAV:", tag, value ); } -bool WebdavHandler::extractBool( const QDomElement &node, const QString &entry, bool &value ) +bool WebdavHandler::extractBool( const TQDomElement &node, const TQString &entry, bool &value ) { - QDomElement element = node.namedItem( entry ).toElement(); + TQDomElement element = node.namedItem( entry ).toElement(); if ( !element.isNull() ) { value = (element.text() != "0"); return true; @@ -96,9 +96,9 @@ bool WebdavHandler::extractBool( const QDomElement &node, const QString &entry, return false; } -bool WebdavHandler::extractLong( const QDomElement &node, const QString &entry, long &value ) +bool WebdavHandler::extractLong( const TQDomElement &node, const TQString &entry, long &value ) { - QDomElement element = node.namedItem( entry ).toElement(); + TQDomElement element = node.namedItem( entry ).toElement(); if ( !element.isNull() ) { value = element.text().toLong(); return true; @@ -106,9 +106,9 @@ bool WebdavHandler::extractLong( const QDomElement &node, const QString &entry, return false; } -bool WebdavHandler::extractFloat( const QDomElement &node, const QString &entry, float &value ) +bool WebdavHandler::extractFloat( const TQDomElement &node, const TQString &entry, float &value ) { - QDomElement element = node.namedItem( entry ).toElement(); + TQDomElement element = node.namedItem( entry ).toElement(); if ( !element.isNull() ) { value = element.text().toFloat(); return true; @@ -116,19 +116,19 @@ bool WebdavHandler::extractFloat( const QDomElement &node, const QString &entry, return false; } -bool WebdavHandler::extractDateTime( const QDomElement &node, const QString &entry, QDateTime &value ) +bool WebdavHandler::extractDateTime( const TQDomElement &node, const TQString &entry, TQDateTime &value ) { - QDomElement element = node.namedItem( entry ).toElement(); + TQDomElement element = node.namedItem( entry ).toElement(); if ( !element.isNull() && !element.text().isEmpty() ) { - value = QDateTime::fromString( element.text(), Qt::ISODate ); + value = TQDateTime::fromString( element.text(), Qt::ISODate ); return true; } return false; } -bool WebdavHandler::extractString( const QDomElement &node, const QString &entry, QString &value ) +bool WebdavHandler::extractString( const TQDomElement &node, const TQString &entry, TQString &value ) { - QDomElement element = node.namedItem( entry ).toElement(); + TQDomElement element = node.namedItem( entry ).toElement(); if ( !element.isNull() ) { value = element.text(); return true; @@ -136,14 +136,14 @@ bool WebdavHandler::extractString( const QDomElement &node, const QString &entry return false; } -bool WebdavHandler::extractStringList( const QDomElement &node, const QString &entry, QStringList &value ) +bool WebdavHandler::extractStringList( const TQDomElement &node, const TQString &entry, TQStringList &value ) { - QDomElement element = node.namedItem( entry ).toElement(); + TQDomElement element = node.namedItem( entry ).toElement(); if ( !element.isNull() ) { value.clear(); - QDomNodeList list = element.elementsByTagNameNS( "xml:", "v" ); + TQDomNodeList list = element.elementsByTagNameNS( "xml:", "v" ); for( uint i=0; i < list.count(); i++ ) { - QDomElement item = list.item(i).toElement(); + TQDomElement item = list.item(i).toElement(); value.append( item.text() ); } return true; @@ -152,20 +152,20 @@ bool WebdavHandler::extractStringList( const QDomElement &node, const QString &e } -const QString WebdavHandler::getEtagFromHeaders( const QString& headers ) +const TQString WebdavHandler::getEtagFromHeaders( const TQString& headers ) { int start = headers.find( "etag:", 0, false ); - if ( start < 0 ) return QString(); + if ( start < 0 ) return TQString(); start += 6; return headers.mid( start, headers.find( "\n", start ) - start ); } //TODO: should not call libical functions directly -- better to make // a new libkcal abstraction method. -QDateTime WebdavHandler::utcAsZone( const QDateTime& utc, const QString& timeZoneId ) +TQDateTime WebdavHandler::utcAsZone( const TQDateTime& utc, const TQString& timeZoneId ) { int daylight; - QDateTime epoch; + TQDateTime epoch; epoch.setTime_t( 0 ); time_t v = epoch.secsTo( utc ); struct icaltimetype tt = @@ -180,10 +180,10 @@ kdDebug() << "Calculated offset of: " << offset << " of timezone: " << timeZoneI //TODO: should not call libical functions directly -- better to make // a new libkcal abstraction method. -QDateTime WebdavHandler::zoneAsUtc( const QDateTime& zone, const QString& timeZoneId ) +TQDateTime WebdavHandler::zoneAsUtc( const TQDateTime& zone, const TQString& timeZoneId ) { int daylight; - QDateTime epoch; + TQDateTime epoch; epoch.setTime_t( 0 ); time_t v = epoch.secsTo( zone ); struct icaltimetype tt = icaltime_from_timet( v, 0 ); // 0: is_date=false diff --git a/kresources/lib/webdavhandler.h b/kresources/lib/webdavhandler.h index cdf616e9c..668f99fdd 100644 --- a/kresources/lib/webdavhandler.h +++ b/kresources/lib/webdavhandler.h @@ -22,10 +22,10 @@ #ifndef WEBDAVHANDLER_H #define WEBDAVHANDLER_H -#include <qstring.h> -#include <qstringlist.h> -#include <qdom.h> -#include <qdatetime.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqdom.h> +#include <tqdatetime.h> #include <kurl.h> #include <kdepimmacros.h> @@ -37,42 +37,42 @@ class KDE_EXPORT WebdavHandler static KURL toDAV( const KURL& url ); - static QDomElement addElementNS( QDomDocument &doc, QDomNode &node, - const QString &ns, const QString &tag, - const QString &value = QString::null ); - static QDomElement addElement( QDomDocument &, QDomNode &, - const QString &tag, const QString &value = QString::null ); - static QDomElement addDavElement( QDomDocument &, QDomNode &, - const QString &tag, const QString &value = QString::null ); + static TQDomElement addElementNS( TQDomDocument &doc, TQDomNode &node, + const TQString &ns, const TQString &tag, + const TQString &value = TQString::null ); + static TQDomElement addElement( TQDomDocument &, TQDomNode &, + const TQString &tag, const TQString &value = TQString::null ); + static TQDomElement addDavElement( TQDomDocument &, TQDomNode &, + const TQString &tag, const TQString &value = TQString::null ); - static bool extractBool( const QDomElement &node, - const QString &entry, bool &value ); - static bool extractLong( const QDomElement &node, - const QString &entry, long &value ); - static bool extractFloat( const QDomElement &node, - const QString &entry, float &value ); - static bool extractDateTime( const QDomElement &node, - const QString &entry, QDateTime &value ); - static bool extractString( const QDomElement &node, - const QString &entry, QString &value ); - static bool extractStringList( const QDomElement &node, - const QString &entry, QStringList &value ); + static bool extractBool( const TQDomElement &node, + const TQString &entry, bool &value ); + static bool extractLong( const TQDomElement &node, + const TQString &entry, long &value ); + static bool extractFloat( const TQDomElement &node, + const TQString &entry, float &value ); + static bool extractDateTime( const TQDomElement &node, + const TQString &entry, TQDateTime &value ); + static bool extractString( const TQDomElement &node, + const TQString &entry, TQString &value ); + static bool extractStringList( const TQDomElement &node, + const TQString &entry, TQStringList &value ); /** * Returns the value of the "etag" header if it can be found in the headers. */ - static const QString getEtagFromHeaders( const QString& ); + static const TQString getEtagFromHeaders( const TQString& ); /** * Return the representation of utc time in the time zone indicated by timeZoneId */ - static QDateTime utcAsZone( const QDateTime& utc, const QString& timeZoneId ); + static TQDateTime utcAsZone( const TQDateTime& utc, const TQString& timeZoneId ); /** * Return the UTC representation of local time in the time zone indicated by timeZoneId */ - static QDateTime zoneAsUtc( const QDateTime& zone, const QString& timeZoneId ); + static TQDateTime zoneAsUtc( const TQDateTime& zone, const TQString& timeZoneId ); }; #endif |