From a9bde819f2b421dcc44741156e75eca4bb5fb4f4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:49:30 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kaddressbook/features/distributionlistwidget.cpp | 4 ++-- kaddressbook/features/resourceselection.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'kaddressbook/features') diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp index d279cc01f..c49deee6a 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 4972fd45d..03e7f1f43 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( mResource ); setOn( res->subresourceActive( mResourceIdentifier ) ); - setPixmap( 0, KGlobal::iconLoader()->loadIcon( "contents", KIcon::Small ) ); + setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "contents", KIcon::Small ) ); mChecked = isOn(); } -- cgit v1.2.1