[Roberto] Small changes so copying these files over to krn is easier,

didn't change anything outside my #ifdefs

svn path=/trunk/kdenetwork/kmail/; revision=4681

kmcomposewin.cpp

@@ -50,6 +50,7 @@ extern KApplication *app;
 extern KBusyPtr *kbp;
 extern KRNSender *msgSender;
 extern KMIdentity *identity;
+extern KMAddrBook *addrBook;
 #define aboutText "KRN"
 /* end added for KRN */
 #else

kmmsgpartdlg.cpp

@@ -2,7 +2,18 @@
 
 #include "kmmsgpartdlg.h"
 #include "kmmsgpart.h"
+
+#ifndef KRN
 #include "kmglobal.h"
+#endif
+
+#ifdef KRN
+#include <klocale.h>
+#include "kbusyptr.h"
+extern KLocale *nls;
+extern KBusyPtr *kbp;
+#endif
+
 #include "kbusyptr.h"
 #include <klocale.h>
 #include <qcombo.h>

kmreaderwin.cpp

@@ -7,6 +7,7 @@
 #ifndef KRN
 #include "kmglobal.h"
 #include "kmmainwin.h"
+#else
 #endif
 
 #include "kmimemagic.h"
@@ -59,8 +60,8 @@ KMReaderWin::KMReaderWin(QWidget *aParent, const char *aName, int aFlags)
   mPicsDir = app->kdedir()+"/share/apps/kmail/pics/";
   mMsg = NULL;
 
-  readConfig();
   initHtmlWidget();
+  readConfig();
 }
 
 
@@ -80,6 +81,23 @@ void KMReaderWin::readConfig(void)
   mHeaderStyle = (HeaderStyle)config->readNumEntry("hdr-style", HdrFancy);
   mAttachmentStyle = (AttachmentStyle)config->readNumEntry("attmnt-style",
 							IconicAttmnt);
+#ifdef KRN
+  config->setGroup("ArticleListOptions");
+  QColor c1=QColor("black");
+  QColor c2=QColor("blue");
+  QColor c3=QColor("red");
+  QColor c4=QColor("white");
+  mViewer->setDefaultBGColor(config->readColorEntry("BackgroundColor",&c4));
+  mViewer->setDefaultTextColors(config->readColorEntry("ForegroundColor",&c1)
+                                ,config->readColorEntry("LinkColor",&c2)
+                                ,config->readColorEntry("FollowedColor",&c3));
+  mViewer->setDefaultFontBase(config->readNumEntry("DefaultFontBase",3));
+  mViewer->setStandardFont(config->readEntry("StandardFont",
+                                           QString("helvetica").data()));
+  mViewer->setFixedFont(config->readEntry("FixedFont",
+                                        QString("courier").data()));
+#endif
+
 }
 
 

kmsender.cpp

@@ -1,10 +1,14 @@
 // kmsender.cpp
 
-#include "kmsender.h"
+
+#ifndef KRN
 #include "kmfoldermgr.h"
-#include "kmmessage.h"
 #include "kmglobal.h"
 #include "kmfolder.h"
+#endif
+
+#include "kmsender.h"
+#include "kmmessage.h"
 #include "kmidentity.h"
 #include "kmiostatusdlg.h"
 
@@ -14,6 +18,14 @@
 #include <klocale.h>
 #include <qregexp.h>
 
+#ifdef KRN
+#include <kapp.h>
+#include <klocale.h>
+extern KApplication *app;
+extern KLocale *nls;
+extern KMIdentity *identity;
+#endif
+
 #include <assert.h>
 #include <stdio.h>
 #include <sys/types.h>
@@ -106,6 +118,8 @@ bool KMSender::settingsOk(void) const
 //-----------------------------------------------------------------------------
 bool KMSender::send(KMMessage* aMsg, short sendNow)
 {
+
+#ifndef KRN
   int rc;
 
   assert(aMsg != NULL);
@@ -133,12 +147,16 @@ bool KMSender::send(KMMessage* aMsg, short sendNow)
   outboxFolder->close();
 
   return rc;
+#else
+  return true;
+#endif
 }
 
 
 //-----------------------------------------------------------------------------
 bool KMSender::sendQueued(void)
 {
+#ifndef KRN
   if (!settingsOk()) return FALSE;
 
   if (mSendInProgress)
@@ -163,12 +181,16 @@ bool KMSender::sendQueued(void)
   // start sending the messages
   doSendMsg();
   return TRUE;
+#else
+  return TRUE;
+#endif
 }
 
 
 //-----------------------------------------------------------------------------
 void KMSender::doSendMsg(void)
 {
+#ifndef KRN
   assert(mSendProc != NULL);
 
   // Move previously sent message to folder "sent"
@@ -215,12 +237,14 @@ void KMSender::doSendMsg(void)
   }
   // Do *not* add code here, after send(). It can happen that this method
   // is called recursively if send() emits the idle signal directly.
+#endif
 }
 
 
 //-----------------------------------------------------------------------------
 void KMSender::cleanup(void)
 {
+#ifndef KRN
   assert(mSendProc!=NULL);
 
   if (mSendProcStarted) mSendProc->finish();
@@ -230,6 +254,7 @@ void KMSender::cleanup(void)
   outboxFolder->close();
   outboxFolder->expunge();
   emit statusMsg(nls->translate("Done sending messages."));
+#endif
 }