1 files changed, 18 insertions, 6 deletions
diff --git a/kmail/kmreaderwin.h b/kmail/kmreaderwin.h
index c9f78aec..df4d8845 100644
--- a/kmail/kmreaderwin.h
+++ b/kmail/kmreaderwin.h
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 // Header for kmreaderwin the kmail reader
 // written by Markus Wuebben <markus.wuebben@kde.org>
 
@@ -74,7 +73,7 @@ namespace KParts {
 */
 
 class KMReaderWin: public TQWidget, public KMail::Interface::Observer {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   friend void KMMimePartTree::itemClicked( TQListViewItem* item );
@@ -102,7 +101,7 @@ public:
   /** Read settings from app's config file. */
   void readConfig();
 
-  /** Write settings to app's config file. Calls sync() if withSync is TRUE. */
+  /** Write settings to app's config file. Calls sync() if withSync is true. */
   void writeConfig( bool withSync=true ) const;
 
   const KMail::HeaderStyle * headerStyle() const {
@@ -200,9 +199,22 @@ public:
   bool htmlOverride() const { return mHtmlOverride; }
   void setHtmlOverride( bool override );
 
-  /** Override default load external references setting */
+  /** Get the load external references override setting */
   bool htmlLoadExtOverride() const { return mHtmlLoadExtOverride; }
-  void setHtmlLoadExtOverride( bool override );
+
+  /** Default behavior for loading external references.
+   *  Use this for specifying the external reference loading behavior as
+   *  specified in the user settings.
+   *  @see setHtmlLoadExtOverride
+   */
+  void setHtmlLoadExtDefault(bool loadExtDefault);
+
+  /** Override default load external references setting
+   *  @warning This must only be called when the user has explicitly
+   *  been asked to retrieve external references!
+   *  @see setHtmlLoadExtDefault
+   */
+  void setHtmlLoadExtOverride(bool loadExtOverride);
 
   /** Is html mail to be supported? Takes into account override */
   bool htmlMail();
@@ -545,7 +557,7 @@ private:
   TQString renderAttachments( partNode *node, const TQColor &bgColor );
 
 private:
-  bool mHtmlMail, mHtmlLoadExternal, mHtmlOverride, mHtmlLoadExtOverride;
+  bool mHtmlMail, mHtmlLoadExtDefault, mHtmlOverride, mHtmlLoadExtOverride;
   int mAtmCurrent;
   TQString mAtmCurrentName;
   KMMessage *mMessage;