summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2024-09-24 11:12:04 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2024-09-24 11:36:18 +0900
commit1fb5101d491c1c4b3483540489dd109a59bfce2d (patch)
tree7c0cfeb464b6d94e01146077593f54757e2a845e
parentf8f28b44bd388289f806a2cc7a56adf3d297f65d (diff)
downloadtdepim-1fb5101d491c1c4b3483540489dd109a59bfce2d.tar.gz
tdepim-1fb5101d491c1c4b3483540489dd109a59bfce2d.zip
Remove unused code
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--kmail/antispamconfig.cpp2
-rw-r--r--kmail/bodypartformatter.cpp2
-rw-r--r--kmail/kmmessage.cpp2
-rw-r--r--kmail/kmreaderwin.cpp2
-rw-r--r--kmail/partNode.cpp2
-rw-r--r--libemailfunctions/CMakeLists.txt3
-rw-r--r--libemailfunctions/Makefile.am2
-rw-r--r--libemailfunctions/kasciistricmp.cpp47
-rw-r--r--libemailfunctions/kasciistricmp.h28
-rw-r--r--tdeioslave/imap4/imapparser.cpp2
10 files changed, 8 insertions, 84 deletions
diff --git a/kmail/antispamconfig.cpp b/kmail/antispamconfig.cpp
index f187dcd6c..75959a122 100644
--- a/kmail/antispamconfig.cpp
+++ b/kmail/antispamconfig.cpp
@@ -33,7 +33,7 @@
#include "antispamconfig.h"
-#include <kasciistricmp.h>
+#include <tdeglobal.h>
#include <kstaticdeleter.h>
#include <tdeconfig.h>
diff --git a/kmail/bodypartformatter.cpp b/kmail/bodypartformatter.cpp
index 8435ef25e..753608833 100644
--- a/kmail/bodypartformatter.cpp
+++ b/kmail/bodypartformatter.cpp
@@ -46,7 +46,7 @@
#include <mimelib/utility.h>
#include <kdebug.h>
-#include <kasciistricmp.h>
+#include <tdeglobal.h>
namespace {
class AnyTypeBodyPartFormatter
diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp
index f9a7f3888..70ba72c22 100644
--- a/kmail/kmmessage.cpp
+++ b/kmail/kmmessage.cpp
@@ -34,13 +34,13 @@ using KMail::HeaderStrategy;
#include <kaddrbook.h>
#include <tdeapplication.h>
+#include <tdeglobal.h>
#include <tdeglobalsettings.h>
#include <kdebug.h>
#include <tdeconfig.h>
#include <tdehtml_part.h>
#include <kuser.h>
#include <kidna.h>
-#include <kasciistricmp.h>
#include <tqcursor.h>
#include <tqtextcodec.h>
diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp
index 8ada99f40..527173480 100644
--- a/kmail/kmreaderwin.cpp
+++ b/kmail/kmreaderwin.cpp
@@ -99,6 +99,7 @@ using KMail::TeeHtmlWriter;
#include <tdefiledialog.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
+#include <tdeglobal.h>
#include <tdeglobalsettings.h>
#include <krun.h>
#include <tdetempfile.h>
@@ -107,7 +108,6 @@ using KMail::TeeHtmlWriter;
#include <tdeaction.h>
#include <kiconloader.h>
#include <kmdcodec.h>
-#include <kasciistricmp.h>
#include <kurldrag.h>
#include <tqclipboard.h>
diff --git a/kmail/partNode.cpp b/kmail/partNode.cpp
index b39bc65f1..6d4dfe62e 100644
--- a/kmail/partNode.cpp
+++ b/kmail/partNode.cpp
@@ -39,7 +39,7 @@
#include "kmmimeparttree.h"
#include <mimelib/utility.h>
#include <tqregexp.h>
-#include <kasciistricmp.h>
+#include <tdeglobal.h>
#include "util.h"
/*
diff --git a/libemailfunctions/CMakeLists.txt b/libemailfunctions/CMakeLists.txt
index 725dbe077..70b69d141 100644
--- a/libemailfunctions/CMakeLists.txt
+++ b/libemailfunctions/CMakeLists.txt
@@ -33,6 +33,5 @@ endif()
tde_add_library( emailfunctions STATIC_PIC AUTOMOC
SOURCES
- email.cpp idmapper.cpp kasciistricmp.cpp
- kasciistringtools.cpp networkstatus.cpp networkstatus.skel
+ email.cpp idmapper.cpp kasciistringtools.cpp networkstatus.cpp networkstatus.skel
)
diff --git a/libemailfunctions/Makefile.am b/libemailfunctions/Makefile.am
index f631afa38..ece8b103c 100644
--- a/libemailfunctions/Makefile.am
+++ b/libemailfunctions/Makefile.am
@@ -1,7 +1,7 @@
INCLUDES = $(all_includes) -I$(srcdir)/../libkmime/
noinst_LTLIBRARIES = libemailfunctions.la
-libemailfunctions_la_SOURCES = email.cpp idmapper.cpp kasciistricmp.cpp \
+libemailfunctions_la_SOURCES = email.cpp idmapper.cpp \
kasciistringtools.cpp \
networkstatus.cpp networkstatus.skel
libemailfunctions_la_LDFLAGS = $(all_libraries) -no-undefined
diff --git a/libemailfunctions/kasciistricmp.cpp b/libemailfunctions/kasciistricmp.cpp
deleted file mode 100644
index 2852bb42a..000000000
--- a/libemailfunctions/kasciistricmp.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/* This file is part of the KDE libraries
- Copyright (C) 2004 David Faure <faure@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License version 2 as published by the Free Software Foundation.
-
- 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include "kasciistricmp.h"
-
-#if ! KDE_IS_VERSION(3,3,89)
-
-static unsigned char tdepim_ASCIIToLower( unsigned char ch )
-{
- if ( ch >= 'A' && ch <= 'Z' )
- return ch - 'A' + 'a';
- else
- return ch;
-}
-
-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;
- int res;
- unsigned char c;
-
- if ( !s1 || !s2 )
- return s1 ? 1 : ( s2 ? -1 : 0 );
- for ( ; !( res = ( c = tdepim_ASCIIToLower( *s1 ) ) - tdepim_ASCIIToLower( *s2 ) );
- ++s1, ++s2 )
- if ( !c ) // strings are equal
- break;
- return res;
-}
-
-#endif
diff --git a/libemailfunctions/kasciistricmp.h b/libemailfunctions/kasciistricmp.h
deleted file mode 100644
index 10c1551e8..000000000
--- a/libemailfunctions/kasciistricmp.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* This file is part of the KDE libraries
- Copyright (C) 2004 David Faure <faure@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License version 2 as published by the Free Software Foundation.
-
- 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include <tdeversion.h>
-
-#if KDE_IS_VERSION(3,3,89)
-// get kasciistricmp from tdeglobal.h
-#include <tdeglobal.h>
-#else
-// define kasciistricmp to this tdepim symbol (renamed to avoid problems when upgrading tdelibs later)
-int tdepim_kasciistricmp( const char *str1, const char *str2 );
-#define kasciistricmp tdepim_kasciistricmp
-#endif
diff --git a/tdeioslave/imap4/imapparser.cpp b/tdeioslave/imap4/imapparser.cpp
index d833b639e..993c5c62d 100644
--- a/tdeioslave/imap4/imapparser.cpp
+++ b/tdeioslave/imap4/imapparser.cpp
@@ -56,7 +56,7 @@ extern "C" {
#include <kmdcodec.h>
#include <kurl.h>
-#include <kasciistricmp.h>
+#include <tdeglobal.h>
#include <kasciistringtools.h>
#ifdef HAVE_LIBSASL2