From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 13 Apr 2011 00:46:47 +0000 Subject: 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 --- kresources/groupware/kabc_resourcegroupware.cpp | 2 +- kresources/groupware/kabc_resourcegroupware.h | 1 + kresources/groupware/kabc_resourcegroupwareconfig.cpp | 12 ++++++------ kresources/groupware/kabc_resourcegroupwareconfig.h | 3 ++- kresources/groupware/kcal_resourcegroupware.cpp | 2 +- kresources/groupware/kcal_resourcegroupware.h | 1 + kresources/groupware/kcal_resourcegroupwareconfig.cpp | 4 ++-- kresources/groupware/kcal_resourcegroupwareconfig.h | 3 ++- 8 files changed, 16 insertions(+), 12 deletions(-) (limited to 'kresources/groupware') diff --git a/kresources/groupware/kabc_resourcegroupware.cpp b/kresources/groupware/kabc_resourcegroupware.cpp index c9fef7a0c..f82b0c756 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 46547fc60..564a3b1fa 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 cfe6ba98c..7232fd1e0 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 32bcfa710..220575c23 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 01a51684f..1dc1bf7c0 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 610203fc3..030d9499b 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 2d5cffe00..dbb76f336 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 c30854715..761a6aa0d 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 ); -- cgit v1.2.1