From bfd7a6e828f9aed7e86376a20d4f151c6b32a571 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@kde.org>
Date: Thu, 26 Feb 1998 15:01:10 +0000
Subject: [PATCH] kdenetwork (haven't tried kppp) compiles now, even if
 kdedir() is private

svn path=/trunk/kdenetwork/kmail/; revision=5599
---
 Makefile.am      | 1 +
 kmfoldertree.cpp | 1 -
 kmheaders.cpp    | 1 -
 kmmsgpart.cpp    | 6 +++---
 kmreaderwin.cpp  | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 625659215..e9b84a16f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,7 @@
 SUBDIRS = pics doc
 INCLUDES = $(all_includes)
 LDADD	= $(all_libraries) -lkhtmlw -ljscript -lkdeui -lkdecore -lqt -lXext -lX11 $(LIBJPEG) -lmimelib $(LIBSOCKET)
+DEFS += "-DCHARSETS"
 
 bin_PROGRAMS = kmail
 
diff --git a/kmfoldertree.cpp b/kmfoldertree.cpp
index b19571d7c..320670de5 100644
--- a/kmfoldertree.cpp
+++ b/kmfoldertree.cpp
@@ -19,7 +19,6 @@ KMFolderTree::KMFolderTree(QWidget *parent,const char *name) :
   KMFolderTreeInherited(parent, name, 1), mList()
 {
   KConfig* conf = app->getConfig();
-  QString  kdir = app->kdedir();
   KIconLoader* loader = app->getIconLoader();
   static QPixmap pixDir, pixNode, pixPlain, pixFld, pixIn, pixOut, pixTr,
 		 pixSent;
diff --git a/kmheaders.cpp b/kmheaders.cpp
index f2b3e8707..1d637f3f4 100644
--- a/kmheaders.cpp
+++ b/kmheaders.cpp
@@ -25,7 +25,6 @@ KMHeaders::KMHeaders(KMMainWin *aOwner, QWidget *parent,
 		     const char *name) :
   KMHeadersInherited(parent, name, 4)
 {
-  QString kdir = app->kdedir();
   KIconLoader* loader = app->getIconLoader();
   static QPixmap pixNew, pixUns, pixDel, pixOld, pixRep, pixSent, pixQueued,
                  pixFwd;
diff --git a/kmmsgpart.cpp b/kmmsgpart.cpp
index 6da5e9f2f..1c4a07028 100644
--- a/kmmsgpart.cpp
+++ b/kmmsgpart.cpp
@@ -155,7 +155,7 @@ void KMMessagePart::magicSetType(bool aAutoDecode)
   if (!sMagic)
   {
     // initialize mime magic
-    sMagic = new KMimeMagic(kapp->kdedir() + "/share/mimelnk/magic");
+    sMagic = new KMimeMagic(kapp->kde_mimedir() + "/magic");
     sMagic->setFollowLinks(TRUE);
   }
 
@@ -175,7 +175,7 @@ const QString KMMessagePart::iconName(void) const
   QString fileName, icon;
   QDir dir;
 
-  fileName = KApplication::kdedir() + "/share/mimelnk/" + mType + "/" + 
+  fileName = KApplication::kde_mimedir() + "/" + mType + "/" + 
              mSubtype + ".kdelnk";
 
   if (dir.exists(fileName))
@@ -192,7 +192,7 @@ const QString KMMessagePart::iconName(void) const
     icon = "unknown.xpm";
   }
 
-  return KApplication::kdedir() + "/share/icons/" + icon;
+  return KApplication::kde_icondir() + "/" + icon;
 }
 
 
diff --git a/kmreaderwin.cpp b/kmreaderwin.cpp
index ffdc22aeb..44f1bb7bf 100644
--- a/kmreaderwin.cpp
+++ b/kmreaderwin.cpp
@@ -58,7 +58,7 @@ KMReaderWin::KMReaderWin(QWidget *aParent, const char *aName, int aFlags)
 {
   initMetaObject();
 
-  mPicsDir = app->kdedir()+"/share/apps/kmail/pics/";
+  mPicsDir = app->kde_datadir()+"/kmail/pics/";
   mMsg = NULL;
 
   initHtmlWidget();