summaryrefslogtreecommitdiffstats
path: root/kmail
diff options
context:
space:
mode:
Diffstat (limited to 'kmail')
-rw-r--r--kmail/CMakeLists.txt4
-rw-r--r--kmail/antispamconfig.cpp2
-rw-r--r--kmail/bodypartformatter.cpp1
-rw-r--r--kmail/configuredialog.cpp4
-rw-r--r--kmail/kmmessage.cpp6
-rw-r--r--kmail/kmmsgbase.cpp10
-rw-r--r--kmail/kmmsgpart.cpp8
-rw-r--r--kmail/kmreaderwin.cpp3
-rw-r--r--kmail/partNode.cpp1
9 files changed, 16 insertions, 23 deletions
diff --git a/kmail/CMakeLists.txt b/kmail/CMakeLists.txt
index daa365ec2..9d503d31a 100644
--- a/kmail/CMakeLists.txt
+++ b/kmail/CMakeLists.txt
@@ -212,8 +212,8 @@ add_custom_target( kmail_settings_base
tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS}
LINK
- emailfunctions-static kmime-shared kpgp-shared tdepim-shared kpimidentities-shared
- mimelib-shared ksieve-shared tdehtml-shared ${INDEX_LIBRARY}
+ kmime-shared kpgp-shared tdepim-shared kpimidentities-shared
+ mimelib-shared ksieve-shared tdecore-shared tdehtml-shared ${INDEX_LIBRARY}
DESTINATION ${LIB_INSTALL_DIR}
DEPENDENCIES kmail_settings_base
)
diff --git a/kmail/antispamconfig.cpp b/kmail/antispamconfig.cpp
index 75959a122..e0dbb5bfb 100644
--- a/kmail/antispamconfig.cpp
+++ b/kmail/antispamconfig.cpp
@@ -33,8 +33,6 @@
#include "antispamconfig.h"
-#include <tdeglobal.h>
-
#include <kstaticdeleter.h>
#include <tdeconfig.h>
diff --git a/kmail/bodypartformatter.cpp b/kmail/bodypartformatter.cpp
index 753608833..3ee62d970 100644
--- a/kmail/bodypartformatter.cpp
+++ b/kmail/bodypartformatter.cpp
@@ -46,7 +46,6 @@
#include <mimelib/utility.h>
#include <kdebug.h>
-#include <tdeglobal.h>
namespace {
class AnyTypeBodyPartFormatter
diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp
index c0beb0fdb..2c5830abd 100644
--- a/kmail/configuredialog.cpp
+++ b/kmail/configuredialog.cpp
@@ -85,7 +85,6 @@ using KMime::DateFormatter;
#include <tdelocale.h>
#include <tdeapplication.h>
#include <kcharsets.h>
-#include <kasciistringtools.h>
#include <kdebug.h>
#include <knuminput.h>
#include <tdefontdialog.h>
@@ -117,6 +116,7 @@ using KMime::DateFormatter;
#include <tqlayout.h>
#include <tqcheckbox.h>
#include <tqwidgetstack.h>
+#include <tqglobal.h>
// other headers:
#include <assert.h>
@@ -3327,7 +3327,7 @@ void ComposerPage::CharsetTab::doLoadOther() {
it != charsets.end() ; ++it )
if ( (*it) == TQString::fromLatin1("locale") ) {
TQCString cset = kmkernel->networkCodec()->mimeName();
- KPIM::kAsciiToLower( cset.data() );
+ kasciitolower( cset.data() );
(*it) = TQString("%1 (locale)").arg( TQString(cset) );
}
diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp
index 70ba72c22..b12ae65cd 100644
--- a/kmail/kmmessage.cpp
+++ b/kmail/kmmessage.cpp
@@ -28,8 +28,6 @@ using KMail::HeaderStrategy;
#include <libkpimidentities/identitymanager.h>
#include <libemailfunctions/email.h>
-#include <kasciistringtools.h>
-
#include <kpgpblock.h>
#include <kaddrbook.h>
@@ -4083,7 +4081,7 @@ TQCString KMMessage::defaultCharset()
if (retval.isEmpty() || (retval == "locale")) {
retval = TQCString(kmkernel->networkCodec()->mimeName());
- KPIM::kAsciiToLower( retval.data() );
+ kasciitolower( retval.data() );
}
if (retval == "jisx0208.1983-0") retval = "iso-2022-jp";
@@ -4145,7 +4143,7 @@ void KMMessage::setCharset( const TQCString &charset, DwEntity *entity )
mType.SetModified();
TQCString lowerCharset = charset;
- KPIM::kAsciiToLower( lowerCharset.data() );
+ kasciitolower( lowerCharset.data() );
param->SetValue( DwString( lowerCharset ) );
mType.Assemble();
}
diff --git a/kmail/kmmsgbase.cpp b/kmail/kmmsgbase.cpp
index abf1ade72..61952a00e 100644
--- a/kmail/kmmsgbase.cpp
+++ b/kmail/kmmsgbase.cpp
@@ -15,13 +15,13 @@ using KMail::MessageProperty;
#include <kdebug.h>
#include <tdeglobal.h>
#include <kcharsets.h>
-#include <kasciistringtools.h>
#include <kmdcodec.h>
#include <krfcdate.h>
#include <mimelib/mimepp.h>
#include <kmime_codecs.h>
+#include <tqglobal.h>
#include <tqtextcodec.h>
#include <tqdeepcopy.h>
#include <tqregexp.h>
@@ -575,7 +575,7 @@ const TQTextCodec* KMMsgBase::codecForName(const TQCString& _str)
{
if (_str.isEmpty()) return 0;
TQCString codec = _str;
- KPIM::kAsciiToLower(codec.data());
+ kasciitolower(codec.data());
return TDEGlobal::charsets()->codecForName(codec);
}
@@ -790,7 +790,7 @@ TQCString KMMsgBase::encodeRFC2047String(const TQString& _str,
if (charset.isEmpty())
{
cset = kmkernel->networkCodec()->mimeName();
- KPIM::kAsciiToLower(cset.data());
+ kasciitolower(cset.data());
}
else cset = charset;
@@ -881,7 +881,7 @@ TQCString KMMsgBase::encodeRFC2231String( const TQString& _str,
if ( charset.isEmpty() )
{
cset = kmkernel->networkCodec()->mimeName();
- KPIM::kAsciiToLower( cset.data() );
+ kasciitolower( cset.data() );
}
else
cset = charset;
@@ -1049,7 +1049,7 @@ TQCString KMMsgBase::autoDetectCharset(const TQCString &_encoding, const TQStrin
if (encoding == "locale")
{
encoding = kmkernel->networkCodec()->mimeName();
- KPIM::kAsciiToLower(encoding.data());
+ kasciitolower(encoding.data());
}
if (text.isEmpty())
return encoding;
diff --git a/kmail/kmmsgpart.cpp b/kmail/kmmsgpart.cpp
index 596828e28..c7fa30d89 100644
--- a/kmail/kmmsgpart.cpp
+++ b/kmail/kmmsgpart.cpp
@@ -12,7 +12,6 @@
#include "globalsettings.h"
#include "util.h"
-#include <kasciistringtools.h>
#include <kmime_charfreq.h>
#include <kmime_codecs.h>
#include <mimelib/enum.h>
@@ -21,6 +20,7 @@
#include <kiconloader.h>
#include <tqtextcodec.h>
+#include <tqglobal.h>
#include <assert.h>
@@ -41,8 +41,8 @@ KMMessagePart::KMMessagePart( TQDataStream & stream )
stream >> mOriginalContentTypeStr >> mName >> mContentDescription
>> mContentDisposition >> mCte >> size >> mPartSpecifier;
- KPIM::kAsciiToLower( mContentDisposition.data() );
- KPIM::kAsciiToUpper( mOriginalContentTypeStr.data() );
+ kasciitolower( mContentDisposition.data() );
+ kasciitoupper( mOriginalContentTypeStr.data() );
// set the type
int sep = mOriginalContentTypeStr.find('/');
@@ -435,7 +435,7 @@ void KMMessagePart::magicSetType(bool aAutoDecode)
TQString KMMessagePart::iconName( int size ) const
{
TQCString mimeType( mType + "/" + mSubtype );
- KPIM::kAsciiToLower( mimeType.data() );
+ kasciitolower( mimeType.data() );
TQString fileName =
KMimeType::mimeType( mimeType )->icon( TQString(), false );
diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp
index 527173480..566298b99 100644
--- a/kmail/kmreaderwin.cpp
+++ b/kmail/kmreaderwin.cpp
@@ -64,7 +64,6 @@ using KMail::FileHtmlWriter;
using KMail::TeeHtmlWriter;
#endif
-#include <kasciistringtools.h>
#include <kstringhandler.h>
#include <mimelib/mimepp.h>
@@ -2350,7 +2349,7 @@ void KMReaderWin::openAttachment( int id, const TQString & name )
}
TQCString contentTypeStr( msgPart.typeStr() + '/' + msgPart.subtypeStr() );
- KPIM::kAsciiToLower( contentTypeStr.data() );
+ kasciitolower( contentTypeStr.data() );
if ( qstrcmp( contentTypeStr, "text/x-vcard" ) == 0 ) {
showVCard( &msgPart );
diff --git a/kmail/partNode.cpp b/kmail/partNode.cpp
index 6d4dfe62e..31b94d68d 100644
--- a/kmail/partNode.cpp
+++ b/kmail/partNode.cpp
@@ -39,7 +39,6 @@
#include "kmmimeparttree.h"
#include <mimelib/utility.h>
#include <tqregexp.h>
-#include <tdeglobal.h>
#include "util.h"
/*
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-19 15:58:25 +0000