diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-14 20:16:30 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-14 20:16:30 +0000 |
commit | 1c93fca14d9ce37499bcfdf994c660186a0b6f17 (patch) | |
tree | f2defe163a805a9e34a2142dfde4cdb5e49241e7 /kaddressbook/kabcore.cpp | |
parent | 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (diff) | |
download | tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.tar.gz tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.zip |
Enable kdepim compilation under Qt4
This will likely break Qt3 compilation temporarily, which is an unintended side effect.
A third and final kdepim commit will repair Qt3 compilation shortly.
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kaddressbook/kabcore.cpp')
-rw-r--r-- | kaddressbook/kabcore.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 14f9577a6..23ebc277b 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -94,7 +94,7 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *tqparent, const TQString &file, const char *name ) - : KAB::Core( client, tqparent, name ), mStatusBar( 0 ), mViewManager( 0 ), + : KAB::Core( client, TQT_TQOBJECT(tqparent), name ), mStatusBar( 0 ), mViewManager( 0 ), mExtensionManager( 0 ), mJumpButtonBar( 0 ), mCategorySelectDialog( 0 ), mCategoryEditDialog( 0 ), mLdapSearchDialog( 0 ), mReadWrite( readWrite ), mModified( false ) @@ -114,7 +114,7 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *tqparent, mAddressBook = new KABC::AddressBook; mAddressBook->addResource( new KABC::ResourceFile( file ) ); if ( !mAddressBook->load() ) { - KMessageBox::error( tqparent, i18n("Unable to load '%1'.").arg( file ) ); + KMessageBox::error( tqparent, i18n("Unable to load '%1'.").tqarg( file ) ); } } mAddressBook->setErrorHandler( new KABC::GuiErrorHandler( mWidget ) ); @@ -140,7 +140,7 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *tqparent, mAddressBook->addCustomField( i18n( "Blog" ), KABC::Field::Personal, "BlogFeed", "KADDRESSBOOK" ); - mSearchManager = new KAB::SearchManager( mAddressBook, tqparent ); + mSearchManager = new KAB::SearchManager( mAddressBook, TQT_TQOBJECT(tqparent) ); connect( mSearchManager, TQT_SIGNAL( contactsUpdated() ), this, TQT_SLOT( slotContactsUpdated() ) ); @@ -430,7 +430,7 @@ void KABCore::setContactSelected( const TQString &uid ) mActionMerge->setEnabled( ( list.size() == 2 ) && writable ); if ( mReadWrite ) { - TQClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::tqclipboard(); #if defined(KABC_VCARD_ENCODING_FIX) const TQMimeSource *data = cb->data( TQClipboard::Clipboard ); list = AddresseeUtil::clipboardToAddressees( data->tqencodedData( "text/x-vcard" ) ); @@ -552,11 +552,11 @@ void KABCore::copyContacts() #if defined(KABC_VCARD_ENCODING_FIX) TQByteArray clipText = AddresseeUtil::addresseesToClipboard( addrList ); - TQClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::tqclipboard(); cb->setText( TQString::fromUtf8( clipText.data() ) ); #else TQString clipText = AddresseeUtil::addresseesToClipboard( addrList ); - TQClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::tqclipboard(); cb->setText( clipText ); #endif } @@ -575,7 +575,7 @@ void KABCore::cutContacts() void KABCore::pasteContacts() { - TQClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::tqclipboard(); #if defined(KABC_VCARD_ENCODING_FIX) const TQMimeSource *data = cb->data( TQClipboard::Clipboard ); KABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( data->tqencodedData( "text/x-vcard" ) ); @@ -640,7 +640,7 @@ void KABCore::setWhoAmI() } TQString text( i18n( "<qt>Do you really want to use <b>%1</b> as your new personal contact?</qt>" ) ); - if ( KMessageBox::questionYesNo( mWidget, text.arg( addrList[ 0 ].assembledName() ), TQString(), i18n("Use"), i18n("Do Not Use") ) == KMessageBox::Yes ) + if ( KMessageBox::questionYesNo( mWidget, text.tqarg( addrList[ 0 ].assembledName() ), TQString(), i18n("Use"), i18n("Do Not Use") ) == KMessageBox::Yes ) static_cast<KABC::StdAddressBook*>( KABC::StdAddressBook::self( true ) )->setWhoAmI( addrList[ 0 ] ); } @@ -661,7 +661,7 @@ void KABCore::incrementalJumpButtonSearch( const TQString& character ) KABC::AddresseeList::ConstIterator it; const KABC::AddresseeList::ConstIterator endIt( list.end() ); for ( it = list.begin(); it != endIt; ++it ) { - if ( field->value( *it ).startsWith( character, false ) ) { + if ( field->value( *it ).tqstartsWith( character, false ) ) { mViewManager->setSelected( (*it).uid(), true ); return; } @@ -720,7 +720,7 @@ void KABCore::newDistributionList() bool foundUnused = false; int i = 1; while ( !foundUnused ) { - name = i18n( "New Distribution List (%1)" ).arg( i++ ); + name = i18n( "New Distribution List (%1)" ).tqarg( i++ ); foundUnused = KPIM::DistributionList::findByName( addressBook(), name ).isEmpty(); } } @@ -897,7 +897,7 @@ void KABCore::save() if ( ticket ) { if ( !mAddressBook->save( ticket ) ) { KMessageBox::error( mWidget, - i18n( "<qt>Unable to save address book <b>%1</b>.</qt>" ).arg( it.current()->resourceName() ) ); + i18n( "<qt>Unable to save address book <b>%1</b>.</qt>" ).tqarg( it.current()->resourceName() ) ); mAddressBook->releaseSaveTicket( ticket ); } else { setModified( false ); @@ -905,7 +905,7 @@ void KABCore::save() } else { KMessageBox::error( mWidget, i18n( "<qt>Unable to get access for saving the address book <b>%1</b>.</qt>" ) - .arg( it.current()->resourceName() ) ); + .tqarg( it.current()->resourceName() ) ); } ++it; @@ -1205,7 +1205,7 @@ void KABCore::initGUI() mDetailsSplitter = new TQSplitter( mWidget ); mLeftSplitter = new TQSplitter( mDetailsSplitter ); - mLeftSplitter->setOrientation( KABPrefs::instance()->contactListAboveExtensions() ? TQt::Vertical : TQt::Horizontal ); + mLeftSplitter->setOrientation( KABPrefs::instance()->contactListAboveExtensions() ? Qt::Vertical : Qt::Horizontal ); topLayout->addWidget( searchTB ); topLayout->addWidget( mDetailsSplitter ); @@ -1292,7 +1292,7 @@ void KABCore::initGUI() topLayout->setStretchFactor( mDetailsSplitter, 1 ); - mXXPortManager = new XXPortManager( this, mWidget ); + mXXPortManager = new XXPortManager( this, TQT_TQOBJECT(mWidget) ); initActions(); } @@ -1311,7 +1311,7 @@ void KABCore::createJumpButtonBar() void KABCore::initActions() { - connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), + connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ), TQT_SLOT( clipboardDataChanged() ) ); KAction *action; @@ -1432,7 +1432,7 @@ void KABCore::initActions() void KABCore::clipboardDataChanged() { if ( mReadWrite ) - mActionPaste->setEnabled( !TQApplication::clipboard()->text().isEmpty() ); + mActionPaste->setEnabled( !TQApplication::tqclipboard()->text().isEmpty() ); } void KABCore::updateIncSearchWidget() @@ -1634,7 +1634,7 @@ void KABCore::removeSelectedContactsFromDistList() "<b>Note:</b>The contacts will be not be removed from your addressbook nor from " "any other distribution list." "</qt>", - uids.count() ).arg( mSelectedDistributionList ), + uids.count() ).tqarg( mSelectedDistributionList ), names, TQString(), KStdGuiItem::del() ) == KMessageBox::Cancel ) { return; } @@ -1729,7 +1729,7 @@ void KABCore::setSelectedDistributionList( const TQString &name ) mSearchManager->setSelectedDistributionList( name ); mViewHeaderLabel->setText( name.isNull() ? i18n( "Contacts" ) : - i18n( "Distribution List: %1" ).arg( name ) ); + i18n( "Distribution List: %1" ).tqarg( name ) ); mDistListButtonWidget->setShown( !mSelectedDistributionList.isNull() ); if ( !name.isNull() ) { mDetailsStack->raiseWidget( mDistListEntryView ); |