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 /kaddressbook/features | |
| parent | 5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff) | |
| download | tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kaddressbook/features')
| -rw-r--r-- | kaddressbook/features/distributionlistwidget.cpp | 4 | ||||
| -rw-r--r-- | kaddressbook/features/resourceselection.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp index d279cc01..c49deee6 100644 --- a/kaddressbook/features/distributionlistwidget.cpp +++ b/kaddressbook/features/distributionlistwidget.cpp @@ -221,7 +221,7 @@ DistributionListWidget::DistributionListWidget( KAB::Core *core, TQWidget *paren installEventFilter( catcher ); mContactView->installEventFilter( catcher ); - mContactView->restoreLayout( KGlobal::config(), "DistributionListViewColumns" ); + mContactView->restoreLayout( TDEGlobal::config(), "DistributionListViewColumns" ); KAcceleratorManager::manage( this ); } @@ -232,7 +232,7 @@ DistributionListWidget::~DistributionListWidget() delete mManager; #endif - mContactView->saveLayout( KGlobal::config(), "DistributionListViewColumns" ); + mContactView->saveLayout( TDEGlobal::config(), "DistributionListViewColumns" ); } void DistributionListWidget::save() diff --git a/kaddressbook/features/resourceselection.cpp b/kaddressbook/features/resourceselection.cpp index 4972fd45..03e7f1f4 100644 --- a/kaddressbook/features/resourceselection.cpp +++ b/kaddressbook/features/resourceselection.cpp @@ -64,7 +64,7 @@ class ResourceItem : public TQCheckListItem mResourceIdentifier() { setOn( resource->isActive() ); - setPixmap( 0, KGlobal::iconLoader()->loadIcon( "contents", KIcon::Small ) ); + setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "contents", KIcon::Small ) ); mChecked = isOn(); } @@ -77,7 +77,7 @@ class ResourceItem : public TQCheckListItem { KPIM::ResourceABC* res = dynamic_cast<KPIM::ResourceABC *>( mResource ); setOn( res->subresourceActive( mResourceIdentifier ) ); - setPixmap( 0, KGlobal::iconLoader()->loadIcon( "contents", KIcon::Small ) ); + setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "contents", KIcon::Small ) ); mChecked = isOn(); } |