summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-15 18:58:18 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-15 18:58:18 -0600
commitc0fc75368b41146e605536e973e1d635b9d64ced (patch)
tree06de3a4e7062ba08e089a10b172bda52f28dfb3f
parent0953e163d461bdccfb36d86464d9f6505558388a (diff)
downloadtdepim-c0fc75368b41146e605536e973e1d635b9d64ced.tar.gz
tdepim-c0fc75368b41146e605536e973e1d635b9d64ced.zip
Rename KDE_VERSION to TDE_VERSION
-rw-r--r--kaddressbook/addresseditwidget.cpp2
-rw-r--r--kaddressbook/common/locationmap.cpp2
-rw-r--r--kaddressbook/searchmanager.cpp2
-rw-r--r--kaddressbook/viewmanager.cpp2
-rw-r--r--kaddressbook/views/contactlistview.cpp2
5 files changed, 5 insertions, 5 deletions
diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp
index a23c4436b..cf9fd767c 100644
--- a/kaddressbook/addresseditwidget.cpp
+++ b/kaddressbook/addresseditwidget.cpp
@@ -221,7 +221,7 @@ void AddressEditWidget::updateAddressEdit()
if ( it != mAddressList.end() ) {
KABC::Address a = *it;
if ( !a.isEmpty() ) {
-#if KDE_VERSION >= 319
+#if TDE_VERSION >= 319
if ( a.type() & KABC::Address::Work && mAddressee.realName() != mAddressee.organization() ) {
mAddressField->setText( a.formattedAddress( mAddressee.realName(),
mAddressee.organization() ) );
diff --git a/kaddressbook/common/locationmap.cpp b/kaddressbook/common/locationmap.cpp
index f4f08fe5b..5023f4608 100644
--- a/kaddressbook/common/locationmap.cpp
+++ b/kaddressbook/common/locationmap.cpp
@@ -78,7 +78,7 @@ TQString LocationMap::createUrl( const KABC::Address &addr )
return TQString();
}
-#if KDE_VERSION >= 319
+#if TDE_VERSION >= 319
return urlTemplate.replace( "%s", addr.street() ).
replace( "%r", addr.region() ).
replace( "%l", addr.locality() ).
diff --git a/kaddressbook/searchmanager.cpp b/kaddressbook/searchmanager.cpp
index 1cc1a9aae..1213b8a59 100644
--- a/kaddressbook/searchmanager.cpp
+++ b/kaddressbook/searchmanager.cpp
@@ -44,7 +44,7 @@ void SearchManager::search( const TQString &pattern, const KABC::Field::List &fi
KABC::Addressee::List allContacts;
mContacts.clear();
-#if KDE_VERSION >= 319
+#if TDE_VERSION >= 319
KABC::AddresseeList list( mAddressBook->allAddressees() );
if ( !fields.isEmpty() )
list.sortByField( fields.first() );
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index 416b54731..5404fd5cb 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -565,7 +565,7 @@ int ViewManager::filterPosition( const TQString &name ) const
void ViewManager::initActions()
{
mActionSelectView = new KSelectAction( i18n( "Select View" ), 0, mCore->actionCollection(), "select_view" );
-#if KDE_VERSION >= 309
+#if TDE_VERSION >= 309
mActionSelectView->setMenuAccelsEnabled( false );
#endif
connect( mActionSelectView, TQT_SIGNAL( activated( const TQString& ) ),
diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp
index 47a1e86e1..0807cce64 100644
--- a/kaddressbook/views/contactlistview.cpp
+++ b/kaddressbook/views/contactlistview.cpp
@@ -167,7 +167,7 @@ TQString ContactListViewItem::key(int column, bool ascending) const
if ( column >= parentListView->columns() )
return TQString();
-#if KDE_VERSION >= 319
+#if TDE_VERSION >= 319
Q_UNUSED( ascending )
if ( parentListView->showIM() ) {
// in this case, one column is reserved for IM presence