summaryrefslogtreecommitdiffstats
path: root/libemailfunctions
diff options
context:
space:
mode:
Diffstat (limited to 'libemailfunctions')
-rw-r--r--libemailfunctions/email.cpp2
-rw-r--r--libemailfunctions/email.h4
-rw-r--r--libemailfunctions/idmapper.cpp2
-rw-r--r--libemailfunctions/idmapper.h4
-rw-r--r--libemailfunctions/kasciistricmp.cpp6
-rw-r--r--libemailfunctions/kasciistricmp.h6
-rw-r--r--libemailfunctions/tests/Makefile.am4
7 files changed, 14 insertions, 14 deletions
diff --git a/libemailfunctions/email.cpp b/libemailfunctions/email.cpp
index cf3e4196b..b11b1837c 100644
--- a/libemailfunctions/email.cpp
+++ b/libemailfunctions/email.cpp
@@ -1,6 +1,6 @@
/* -*- mode: C++; c-file-style: "gnu" -*-
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 KDEPIM developers
This library is free software; you can redistribute it and/or
diff --git a/libemailfunctions/email.h b/libemailfunctions/email.h
index 5e5e665b9..79797f4ac 100644
--- a/libemailfunctions/email.h
+++ b/libemailfunctions/email.h
@@ -1,6 +1,6 @@
/* -*- mode: C++; c-file-style: "gnu" -*-
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 KDEPIM developers
This library is free software; you can redistribute it and/or
@@ -25,7 +25,7 @@
#include <tqstringlist.h>
#include <tqcstring.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
/** @file */
diff --git a/libemailfunctions/idmapper.cpp b/libemailfunctions/idmapper.cpp
index 52cfeed83..62bcc7efe 100644
--- a/libemailfunctions/idmapper.cpp
+++ b/libemailfunctions/idmapper.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
diff --git a/libemailfunctions/idmapper.h b/libemailfunctions/idmapper.h
index dcb306979..9e9faadf5 100644
--- a/libemailfunctions/idmapper.h
+++ b/libemailfunctions/idmapper.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
@@ -25,7 +25,7 @@
#include <tqmap.h>
#include <tqvariant.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
namespace KPIM {
diff --git a/libemailfunctions/kasciistricmp.cpp b/libemailfunctions/kasciistricmp.cpp
index 1a66a52b5..2852bb42a 100644
--- a/libemailfunctions/kasciistricmp.cpp
+++ b/libemailfunctions/kasciistricmp.cpp
@@ -20,7 +20,7 @@
#if ! KDE_IS_VERSION(3,3,89)
-static unsigned char kdepim_ASCIIToLower( unsigned char ch )
+static unsigned char tdepim_ASCIIToLower( unsigned char ch )
{
if ( ch >= 'A' && ch <= 'Z' )
return ch - 'A' + 'a';
@@ -28,7 +28,7 @@ static unsigned char kdepim_ASCIIToLower( unsigned char ch )
return ch;
}
-int kdepim_kasciistricmp( const char *str1, const char *str2 )
+int tdepim_kasciistricmp( const char *str1, const char *str2 )
{
const unsigned char *s1 = (const unsigned char *) str1;
const unsigned char *s2 = (const unsigned char *) str2;
@@ -37,7 +37,7 @@ int kdepim_kasciistricmp( const char *str1, const char *str2 )
if ( !s1 || !s2 )
return s1 ? 1 : ( s2 ? -1 : 0 );
- for ( ; !( res = ( c = kdepim_ASCIIToLower( *s1 ) ) - kdepim_ASCIIToLower( *s2 ) );
+ for ( ; !( res = ( c = tdepim_ASCIIToLower( *s1 ) ) - tdepim_ASCIIToLower( *s2 ) );
++s1, ++s2 )
if ( !c ) // strings are equal
break;
diff --git a/libemailfunctions/kasciistricmp.h b/libemailfunctions/kasciistricmp.h
index 852fd266a..8d423d42c 100644
--- a/libemailfunctions/kasciistricmp.h
+++ b/libemailfunctions/kasciistricmp.h
@@ -22,7 +22,7 @@
// get kasciistricmp from kglobal.h
#include <kglobal.h>
#else
-// define kasciistricmp to this kdepim symbol (renamed to avoid problems when upgrading kdelibs later)
-int kdepim_kasciistricmp( const char *str1, const char *str2 );
-#define kasciistricmp kdepim_kasciistricmp
+// define kasciistricmp to this tdepim symbol (renamed to avoid problems when upgrading kdelibs later)
+int tdepim_kasciistricmp( const char *str1, const char *str2 );
+#define kasciistricmp tdepim_kasciistricmp
#endif
diff --git a/libemailfunctions/tests/Makefile.am b/libemailfunctions/tests/Makefile.am
index 366725aaf..0bfb9ca08 100644
--- a/libemailfunctions/tests/Makefile.am
+++ b/libemailfunctions/tests/Makefile.am
@@ -4,10 +4,10 @@ LDADD = ../libemailfunctions.la ../../libkmime/libkmime.la $(LIB_KDECORE)
check_PROGRAMS = testidmapper testemail
TESTS = testemail
-testidmapper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+testidmapper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testidmapper_SOURCES = testidmapper.cpp
-testemail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+testemail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testemail_SOURCES = testemail.cpp
METASOURCES = AUTO