diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:30 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:30 -0600 |
| commit | a9bde819f2b421dcc44741156e75eca4bb5fb4f4 (patch) | |
| tree | d087071b1e8fcf79698938efec19f8e48bab0799 /libtdepim/addressesdialog.cpp | |
| parent | 5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff) | |
| download | tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'libtdepim/addressesdialog.cpp')
| -rw-r--r-- | libtdepim/addressesdialog.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libtdepim/addressesdialog.cpp b/libtdepim/addressesdialog.cpp index 667ae97b6..4e46705b0 100644 --- a/libtdepim/addressesdialog.cpp +++ b/libtdepim/addressesdialog.cpp @@ -105,11 +105,11 @@ AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *parent, const KABC::Add if ( addr.photo().url().isEmpty() ) { if ( addr.photo().data().isNull() ) - setPixmap( 0, KGlobal::iconLoader()->loadIcon( "personal", KIcon::Small ) ); + setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "personal", KIcon::Small ) ); else setPixmap( 0, addr.photo().data().smoothScale( 16, 16 ) ); } else { - setPixmap( 0, KGlobal::iconLoader()->loadIcon( addr.photo().url(), KIcon::Small ) ); + setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( addr.photo().url(), KIcon::Small ) ); } } @@ -135,7 +135,7 @@ AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *parent, const TQString d = new AddresseeViewItemPrivate; d->category = DistList; - setPixmap( 0, KGlobal::iconLoader()->loadIcon( "tdmconfig", KIcon::Small ) ); + setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "tdmconfig", KIcon::Small ) ); } AddresseeViewItem::~AddresseeViewItem() @@ -321,7 +321,7 @@ AddressesDialog::setRecentAddresses( const KABC::Addressee::List& list ) void AddressesDialog::updateRecentAddresses() { - static const TQString &recentGroup = KGlobal::staticQString( i18n( "Recent Addresses" ) ); + static const TQString &recentGroup = TDEGlobal::staticQString( i18n( "Recent Addresses" ) ); if ( !d->recent ) { d->recent = new AddresseeViewItem( d->ui->mAvailableView, recentGroup ); @@ -461,7 +461,7 @@ AddressesDialog::updateAvailableAddressees() d->ui->mAvailableView->clear(); d->groupDict.clear(); - static const TQString &personalGroup = KGlobal::staticQString( i18n( "Other Addresses" ) ); + static const TQString &personalGroup = TDEGlobal::staticQString( i18n( "Other Addresses" ) ); d->ui->mAvailableView->setRootIsDecorated( true ); d->personal = new AddresseeViewItem( d->ui->mAvailableView, personalGroup ); //connect(d->personal, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)), |