From 94890b77a597743cd963422144f81df6d751a9c3 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 24 Sep 2024 11:12:04 +0900 Subject: [PATCH] Remove unused code Signed-off-by: Michele Calgaro (cherry picked from commit 1fb5101d491c1c4b3483540489dd109a59bfce2d) --- kmail/antispamconfig.cpp | 2 +- kmail/bodypartformatter.cpp | 2 +- kmail/kmmessage.cpp | 2 +- kmail/kmreaderwin.cpp | 2 +- kmail/partNode.cpp | 2 +- libemailfunctions/CMakeLists.txt | 3 +- libemailfunctions/Makefile.am | 2 +- libemailfunctions/kasciistricmp.cpp | 47 ----------------------------- libemailfunctions/kasciistricmp.h | 28 ----------------- tdeioslave/imap4/imapparser.cpp | 2 +- 10 files changed, 8 insertions(+), 84 deletions(-) delete mode 100644 libemailfunctions/kasciistricmp.cpp delete mode 100644 libemailfunctions/kasciistricmp.h diff --git a/kmail/antispamconfig.cpp b/kmail/antispamconfig.cpp index f187dcd6..75959a12 100644 --- a/kmail/antispamconfig.cpp +++ b/kmail/antispamconfig.cpp @@ -33,7 +33,7 @@ #include "antispamconfig.h" -#include +#include #include #include diff --git a/kmail/bodypartformatter.cpp b/kmail/bodypartformatter.cpp index 8435ef25..75360883 100644 --- a/kmail/bodypartformatter.cpp +++ b/kmail/bodypartformatter.cpp @@ -46,7 +46,7 @@ #include #include -#include +#include namespace { class AnyTypeBodyPartFormatter diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp index f9a7f388..70ba72c2 100644 --- a/kmail/kmmessage.cpp +++ b/kmail/kmmessage.cpp @@ -34,13 +34,13 @@ using KMail::HeaderStrategy; #include #include +#include #include #include #include #include #include #include -#include #include #include diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp index 8ada99f4..52717348 100644 --- a/kmail/kmreaderwin.cpp +++ b/kmail/kmreaderwin.cpp @@ -99,6 +99,7 @@ using KMail::TeeHtmlWriter; #include #include #include +#include #include #include #include @@ -107,7 +108,6 @@ using KMail::TeeHtmlWriter; #include #include #include -#include #include #include diff --git a/kmail/partNode.cpp b/kmail/partNode.cpp index b39bc65f..6d4dfe62 100644 --- a/kmail/partNode.cpp +++ b/kmail/partNode.cpp @@ -39,7 +39,7 @@ #include "kmmimeparttree.h" #include #include -#include +#include #include "util.h" /* diff --git a/libemailfunctions/CMakeLists.txt b/libemailfunctions/CMakeLists.txt index 725dbe07..70b69d14 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 f631afa3..ece8b103 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 2852bb42..00000000 --- a/libemailfunctions/kasciistricmp.cpp +++ /dev/null @@ -1,47 +0,0 @@ -/* This file is part of the KDE libraries - Copyright (C) 2004 David Faure - - 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 10c1551e..00000000 --- a/libemailfunctions/kasciistricmp.h +++ /dev/null @@ -1,28 +0,0 @@ -/* This file is part of the KDE libraries - Copyright (C) 2004 David Faure - - 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 - -#if KDE_IS_VERSION(3,3,89) -// get kasciistricmp from tdeglobal.h -#include -#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 d833b639..993c5c62 100644 --- a/tdeioslave/imap4/imapparser.cpp +++ b/tdeioslave/imap4/imapparser.cpp @@ -56,7 +56,7 @@ extern "C" { #include #include -#include +#include #include #ifdef HAVE_LIBSASL2