diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-13 00:46:47 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-13 00:46:47 +0000 |
commit | 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (patch) | |
tree | 5f52a9eada2e9f3654fc327d7c14dfef570a6ecb /kresources/groupware | |
parent | 2ee4bf4fd5eff93b2fbef0ff8e8063edffc5da5c (diff) | |
download | tdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.tar.gz tdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.zip |
Initial conversion of kdepim to TQt
This will probably require some tweaking before it will build under Qt4,
however Qt3 builds are OK. Any alterations this commit makes to kdepim
behaviour under Qt3 are unintentional and should be fixed.
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kresources/groupware')
8 files changed, 16 insertions, 12 deletions
diff --git a/kresources/groupware/kabc_resourcegroupware.cpp b/kresources/groupware/kabc_resourcegroupware.cpp index c9fef7a0..f82b0c75 100644 --- a/kresources/groupware/kabc_resourcegroupware.cpp +++ b/kresources/groupware/kabc_resourcegroupware.cpp @@ -241,7 +241,7 @@ bool ResourceGroupware::asyncLoad() kdDebug() << "Download URL: " << url << endl; - mJobData = TQString::null; + mJobData = TQString(); mDownloadJob = KPIM::GroupwareJob::getAddressBook( url ); connect( mDownloadJob, TQT_SIGNAL( result( KIO::Job * ) ), diff --git a/kresources/groupware/kabc_resourcegroupware.h b/kresources/groupware/kabc_resourcegroupware.h index 46547fc6..564a3b1f 100644 --- a/kresources/groupware/kabc_resourcegroupware.h +++ b/kresources/groupware/kabc_resourcegroupware.h @@ -35,6 +35,7 @@ class GroupwarePrefs; class ResourceGroupware : public ResourceCached { Q_OBJECT + TQ_OBJECT public: ResourceGroupware( const KConfig * ); diff --git a/kresources/groupware/kabc_resourcegroupwareconfig.cpp b/kresources/groupware/kabc_resourcegroupwareconfig.cpp index cfe6ba98..7232fd1e 100644 --- a/kresources/groupware/kabc_resourcegroupwareconfig.cpp +++ b/kresources/groupware/kabc_resourcegroupwareconfig.cpp @@ -36,11 +36,11 @@ using namespace KABC; -class AddressBookItem : public QCheckListItem +class AddressBookItem : public TQCheckListItem { public: - AddressBookItem( KListView *parent, const TQString &id ) - : TQCheckListItem( parent, "", CheckBox ), + AddressBookItem( KListView *tqparent, const TQString &id ) + : TQCheckListItem( tqparent, "", CheckBox ), mId( id ) { setText( 0, mId ); @@ -58,8 +58,8 @@ class AddressBookItem : public QCheckListItem TQString mId; }; -ResourceGroupwareConfig::ResourceGroupwareConfig( TQWidget* parent, const char* name ) - : KRES::ConfigWidget( parent, name ) +ResourceGroupwareConfig::ResourceGroupwareConfig( TQWidget* tqparent, const char* name ) + : KRES::ConfigWidget( tqparent, name ) { TQGridLayout *mainLayout = new TQGridLayout( this, 7, 2, 0, KDialog::spacingHint() ); @@ -193,7 +193,7 @@ void ResourceGroupwareConfig::updateAddressBookView() Groupware::AddressBook::List::ConstIterator abIt; for ( abIt = addressBooks.begin(); abIt != addressBooks.end(); ++abIt ) { AddressBookItem *item = new AddressBookItem( mAddressBookView, *abIt ); - if ( selectedRead.find( (*abIt).id ) != selectedRead.end() ) + if ( selectedRead.tqfind( (*abIt).id ) != selectedRead.end() ) item->setOn( true ); mAddressBookBox->insertItem( (*abIt).name ); diff --git a/kresources/groupware/kabc_resourcegroupwareconfig.h b/kresources/groupware/kabc_resourcegroupwareconfig.h index 32bcfa71..220575c2 100644 --- a/kresources/groupware/kabc_resourcegroupwareconfig.h +++ b/kresources/groupware/kabc_resourcegroupwareconfig.h @@ -36,9 +36,10 @@ class ResourceGroupware; class ResourceGroupwareConfig : public KRES::ConfigWidget { Q_OBJECT + TQ_OBJECT public: - ResourceGroupwareConfig( TQWidget* parent = 0, const char* name = 0 ); + ResourceGroupwareConfig( TQWidget* tqparent = 0, const char* name = 0 ); public slots: void loadSettings( KRES::Resource* ); diff --git a/kresources/groupware/kcal_resourcegroupware.cpp b/kresources/groupware/kcal_resourcegroupware.cpp index 01a51684..1dc1bf7c 100644 --- a/kresources/groupware/kcal_resourcegroupware.cpp +++ b/kresources/groupware/kcal_resourcegroupware.cpp @@ -156,7 +156,7 @@ bool ResourceGroupware::doLoad() kdDebug() << "Download URL: " << url << endl; - mJobData = TQString::null; + mJobData = TQString(); mDownloadJob = KPIM::GroupwareJob::getCalendar( url ); connect( mDownloadJob, TQT_SIGNAL( result( KIO::Job * ) ), diff --git a/kresources/groupware/kcal_resourcegroupware.h b/kresources/groupware/kcal_resourcegroupware.h index 610203fc..030d9499 100644 --- a/kresources/groupware/kcal_resourcegroupware.h +++ b/kresources/groupware/kcal_resourcegroupware.h @@ -42,6 +42,7 @@ namespace KCal { class ResourceGroupware : public ResourceCached { Q_OBJECT + TQ_OBJECT public: ResourceGroupware(); diff --git a/kresources/groupware/kcal_resourcegroupwareconfig.cpp b/kresources/groupware/kcal_resourcegroupwareconfig.cpp index 2d5cffe0..dbb76f33 100644 --- a/kresources/groupware/kcal_resourcegroupwareconfig.cpp +++ b/kresources/groupware/kcal_resourcegroupwareconfig.cpp @@ -38,8 +38,8 @@ using namespace KCal; -ResourceGroupwareConfig::ResourceGroupwareConfig( TQWidget* parent, const char* name ) - : KRES::ConfigWidget( parent, name ) +ResourceGroupwareConfig::ResourceGroupwareConfig( TQWidget* tqparent, const char* name ) + : KRES::ConfigWidget( tqparent, name ) { resize( 245, 115 ); TQGridLayout *mainLayout = new TQGridLayout( this, 2, 2 ); diff --git a/kresources/groupware/kcal_resourcegroupwareconfig.h b/kresources/groupware/kcal_resourcegroupwareconfig.h index c3085471..761a6aa0 100644 --- a/kresources/groupware/kcal_resourcegroupwareconfig.h +++ b/kresources/groupware/kcal_resourcegroupwareconfig.h @@ -41,8 +41,9 @@ class ResourceCachedSaveConfig; class ResourceGroupwareConfig : public KRES::ConfigWidget { Q_OBJECT + TQ_OBJECT public: - ResourceGroupwareConfig( TQWidget *parent = 0, const char *name = 0 ); + ResourceGroupwareConfig( TQWidget *tqparent = 0, const char *name = 0 ); public slots: virtual void loadSettings( KRES::Resource *resource ); |