summaryrefslogtreecommitdiffstats
path: root/kaddressbook/views
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:49:30 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:49:30 -0600
commita9bde819f2b421dcc44741156e75eca4bb5fb4f4 (patch)
treed087071b1e8fcf79698938efec19f8e48bab0799 /kaddressbook/views
parent5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff)
downloadtdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz
tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kaddressbook/views')
-rw-r--r--kaddressbook/views/cardview.cpp4
-rw-r--r--kaddressbook/views/configurecardviewdialog.cpp2
-rw-r--r--kaddressbook/views/configuretableviewdialog.cpp2
-rw-r--r--kaddressbook/views/contactlistview.cpp4
-rw-r--r--kaddressbook/views/kaddressbookiconview.cpp2
5 files changed, 7 insertions, 7 deletions
diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp
index 9675cdc8b..2979ee5d2 100644
--- a/kaddressbook/views/cardview.cpp
+++ b/kaddressbook/views/cardview.cpp
@@ -1129,7 +1129,7 @@ void CardView::contentsMouseReleaseEvent( TQMouseEvent *e )
// Get the item at this position
CardViewItem *item = itemAt( e->pos() );
- if ( item && KGlobalSettings::singleClick() )
+ if ( item && TDEGlobalSettings::singleClick() )
emit executed( item );
}
@@ -1142,7 +1142,7 @@ void CardView::contentsMouseDoubleClickEvent( TQMouseEvent *e )
if ( item )
d->mCurrentItem = item;
- if ( item && !KGlobalSettings::singleClick() )
+ if ( item && !TDEGlobalSettings::singleClick() )
emit executed(item);
emit doubleClicked( item );
diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp
index 2c815150c..0ffc5e5df 100644
--- a/kaddressbook/views/configurecardviewdialog.cpp
+++ b/kaddressbook/views/configurecardviewdialog.cpp
@@ -91,7 +91,7 @@ void CardViewLookNFeelPage::restoreSettings( KConfig *config )
// colors
cbEnableCustomColors->setChecked( config->readBoolEntry( "EnableCustomColors", false ) );
TQColor c;
- c = KGlobalSettings::baseColor();
+ c = TDEGlobalSettings::baseColor();
lbColors->insertItem( new ColorListItem( i18n("Background Color"),
config->readColorEntry( "BackgroundColor", &c ) ) );
c = colorGroup().foreground();
diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp
index ae9d61551..a8359884b 100644
--- a/kaddressbook/views/configuretableviewdialog.cpp
+++ b/kaddressbook/views/configuretableviewdialog.cpp
@@ -46,7 +46,7 @@ ConfigureTableViewWidget::ConfigureTableViewWidget( KABC::AddressBook *ab,
: ViewConfigureWidget( ab, parent, name )
{
TQWidget *page = addPage( i18n( "Look & Feel" ), TQString(),
- KGlobal::iconLoader()->loadIcon( "looknfeel",
+ TDEGlobal::iconLoader()->loadIcon( "looknfeel",
KIcon::Panel ) );
mPage = new LookAndFeelPage( page );
diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp
index c59c47eee..fbd98f022 100644
--- a/kaddressbook/views/contactlistview.cpp
+++ b/kaddressbook/views/contactlistview.cpp
@@ -240,7 +240,7 @@ void ContactListViewItem::refresh()
if ( (*it)->label() == KABC::Addressee::birthdayLabel() ) {
TQDate date = mAddressee.birthday().date();
if ( date.isValid() )
- setText( i++, KGlobal::locale()->formatDate( date, true ) );
+ setText( i++, TDEGlobal::locale()->formatDate( date, true ) );
else
setText( i++, "" );
} else
@@ -268,7 +268,7 @@ ContactListView::ContactListView(KAddressBookTableView *view,
mSingleLine = false;
mToolTips = true;
mShowIM = true;
- mAlternateColor = KGlobalSettings::alternateBackgroundColor();
+ mAlternateColor = TDEGlobalSettings::alternateBackgroundColor();
setAlternateBackgroundEnabled(mABackground);
setAcceptDrops( true );
diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp
index d9c3aa2f6..42e315c50 100644
--- a/kaddressbook/views/kaddressbookiconview.cpp
+++ b/kaddressbook/views/kaddressbookiconview.cpp
@@ -112,7 +112,7 @@ class AddresseeIconViewItem : public KIconViewItem
setText( mAddressee.givenName() + " " + mAddressee.familyName() );
TQPixmap icon;
- TQPixmap defaultIcon( KGlobal::iconLoader()->loadIcon( "vcard", KIcon::Desktop ) );
+ TQPixmap defaultIcon( TDEGlobal::iconLoader()->loadIcon( "vcard", KIcon::Desktop ) );
KABC::Picture pic = mAddressee.photo();
if ( pic.data().isNull() )
pic = mAddressee.logo();