Remove use of TDE_VERSIONHEADmaster

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

7 files changed, 0 insertions, 95 deletions

diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp
index 173411f4..60b81820 100644
--- a/kaddressbook/addresseditwidget.cpp
+++ b/kaddressbook/addresseditwidget.cpp
@@ -221,35 +221,12 @@ void AddressEditWidget::updateAddressEdit()
   if ( it != mAddressList.end() ) {
     TDEABC::Address a = *it;
     if ( !a.isEmpty() ) {
-#if TDE_VERSION >= 319
       if ( a.type() & TDEABC::Address::Work && mAddressee.realName() != mAddressee.organization() ) {
         mAddressField->setText( a.formattedAddress( mAddressee.realName(),
                                    mAddressee.organization() ) );
       } else {
         mAddressField->setText( a.formattedAddress( mAddressee.realName() ) );
       }
-#else
-      TQString text;
-      if ( !a.street().isEmpty() )
-        text += a.street() + "\n";
-
-      if ( !a.postOfficeBox().isEmpty() )
-        text += a.postOfficeBox() + "\n";
-
-      text += a.locality() + TQString(" ") + a.region();
-
-      if ( !a.postalCode().isEmpty() )
-        text += TQString(", ") + a.postalCode();
-
-      text += "\n";
-
-      if ( !a.country().isEmpty() )
-        text += a.country() + "\n";
-
-      text += a.extended();
-
-      mAddressField->setText( text );
-#endif
     }
   }
 
diff --git a/kaddressbook/common/locationmap.cpp b/kaddressbook/common/locationmap.cpp
index 63ed10ac..8ef225cf 100644
--- a/kaddressbook/common/locationmap.cpp
+++ b/kaddressbook/common/locationmap.cpp
@@ -23,7 +23,6 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <tdeversion.h>
 #include <tdeglobal.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
@@ -78,19 +77,11 @@ TQString LocationMap::createUrl( const TDEABC::Address &addr )
     return TQString();
   }
 
-#if TDE_VERSION >= 319
   return urlTemplate.replace( "%s", addr.street() ).
                      replace( "%r", addr.region() ).
                      replace( "%l", addr.locality() ).
                      replace( "%z", addr.postalCode() ).
                      replace( "%c", addr.countryToISO( addr.country() ) );
-#else
-  return urlTemplate.replace( "%s", addr.street() ).
-                     replace( "%r", addr.region() ).
-                     replace( "%l", addr.locality() ).
-                     replace( "%z", addr.postalCode() ).
-                     replace( "%c", "" );
-#endif
 }
 
 #include "locationmap.moc"
diff --git a/kaddressbook/searchmanager.cpp b/kaddressbook/searchmanager.cpp
index 350a4ffd..a6861d7a 100644
--- a/kaddressbook/searchmanager.cpp
+++ b/kaddressbook/searchmanager.cpp
@@ -23,7 +23,6 @@
 #include <config.h> // FOR TDEPIM_NEW_DISTRLISTS
 
 #include <tdeabc/addresseelist.h>
-#include <tdeversion.h>
 
 #include "searchmanager.h"
 
@@ -44,18 +43,11 @@ void SearchManager::search( const TQString &pattern, const TDEABC::Field::List &
   TDEABC::Addressee::List allContacts;
   mContacts.clear();
 
-#if TDE_VERSION >= 319
   TDEABC::AddresseeList list( mAddressBook->allAddressees() );
   if ( !fields.isEmpty() )
     list.sortByField( fields.first() );
 
   allContacts = list;
-#else
-  TDEABC::AddressBook::ConstIterator abIt( mAddressBook->begin() );
-  const TDEABC::AddressBook::ConstIterator abEndIt( mAddressBook->end() );
-  for ( ; abIt != abEndIt; ++abIt )
-    allContacts.append( *abIt );
-#endif
 
 #ifdef TDEPIM_NEW_DISTRLISTS
   // Extract distribution lists from allContacts
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index 125b95c7..eaeb0ae1 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -31,7 +31,6 @@
 #include <tdeactionclasses.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <tdeversion.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
@@ -565,9 +564,7 @@ int ViewManager::filterPosition( const TQString &name ) const
 void ViewManager::initActions()
 {
   mActionSelectView = new TDESelectAction( i18n( "Select View" ), 0, mCore->actionCollection(), "select_view" );
-#if TDE_VERSION >= 309
   mActionSelectView->setMenuAccelsEnabled( false );
-#endif
   connect( mActionSelectView, TQ_SIGNAL( activated( const TQString& ) ),
            TQ_SLOT( setActiveView( const TQString& ) ) );
 
diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp
index b23f415c..4c4906c7 100644
--- a/kaddressbook/views/contactlistview.cpp
+++ b/kaddressbook/views/contactlistview.cpp
@@ -167,7 +167,6 @@ TQString ContactListViewItem::key(int column, bool ascending) const
   if ( column >= parentListView->columns() )
     return TQString();
 
-#if TDE_VERSION >= 319
   Q_UNUSED( ascending )
   if ( parentListView->showIM() ) {
     // in this case, one column is reserved for IM presence
@@ -185,9 +184,6 @@ TQString ContactListViewItem::key(int column, bool ascending) const
   }
   else
     return mFields[ column ]->sortKey( mAddressee );
-#else
-  return TQListViewItem::key( column, ascending ).lower();
-#endif
 }
 
 void ContactListViewItem::paintCell(TQPainter * p,
diff --git a/libkholidays/kholidays.cpp b/libkholidays/kholidays.cpp
index 44ed99de..201cc8d8 100644
--- a/libkholidays/kholidays.cpp
+++ b/libkholidays/kholidays.cpp
@@ -24,7 +24,6 @@
 #include <kdebug.h>
 
 #include "kholidays.h"
-#include "kholidays_version.h"
 
 extern "C" {
   char *parse_holidays( const char *, int year, short force );
diff --git a/libkholidays/kholidays_version.h b/libkholidays/kholidays_version.h
deleted file mode 100644
index 295dc75e..00000000
--- a/libkholidays/kholidays_version.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-    This file is part of libkholidays.
-    Copyright (c) 2004 Allen Winter <winter@kde.org>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License as
-    published by the Free Software Foundation; either version 2 of the
-    License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-    In addition, as a special exception, the copyright holders give
-    permission to link the code of this program with any edition of
-    the TQt library by Trolltech AS, Norway (or with modified versions
-    of TQt that use the same license as TQt), and distribute linked
-    combinations including the two.  You must obey the GNU General
-    Public License in all respects for all of the code used other than
-    TQt.  If you modify this file, you may extend this exception to
-    your version of the file, but you are not obligated to do so.  If
-    you do not wish to do so, delete this exception statement from
-    your version.
-*/
-
-#ifndef KHOLIDAYS_KHOLIDAYS_VERSION_H
-#define KHOLIDAYS_KHOLIDAYS_VERSION_H
-
-#define LIBKHOLIDAYS_VERSION_STRING "1.0.0"
-#define LIBKHOLIDAYS_VERSION_MAJOR 1
-#define LIBKHOLIDAYS_VERSION_MINOR 0
-#define LIBKHOLIDAYS_VERSION_RELEASE 0
-
-#define LIBKHOLIDAYS_VERSION \
-  TDE_MAKE_VERSION(LIBKHOLIDAYS_VERSION_MAJOR,\
-                   LIBKHOLIDAYS_VERSION_MINOR,\
-                   LIBKHOLIDAYS_VERSION_RELEASE)
-
-#define LIBKHOLIDAYS_IS_VERSION(a,b,c) \
-  ( LIBKHOLIDAYS_VERSION >= TDE_MAKE_VERSION(a,b,c) )
-
-#endif