Replace TRUE/FALSE with boolean values true/false

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

47 files changed, 141 insertions, 141 deletions

diff --git a/kmail/accountmanager.h b/kmail/accountmanager.h
index 31519117..edffac54 100644
--- a/kmail/accountmanager.h
+++ b/kmail/accountmanager.h
@@ -68,7 +68,7 @@ public:
   KMAccount* find( const uint id ) const;
 
   /** Physically remove account. Also deletes the given account object !
-      Returns FALSE and does nothing if the account cannot be removed. */
+      Returns false and does nothing if the account cannot be removed. */
   bool remove( KMAccount* );
 
   /** First account of the list */
diff --git a/kmail/callback.cpp b/kmail/callback.cpp
index 66bcd12f..70020037 100644
--- a/kmail/callback.cpp
+++ b/kmail/callback.cpp
@@ -76,7 +76,7 @@ TQString Callback::askForTransport( bool nullIdentity ) const
                  "Please select the transport which should be used to send your reply.</qt>");
   bool ok;
   const TQString transport = KInputDialog::getItem( i18n( "Select Transport" ), text,
-                                        transports, defaultIndex, FALSE, &ok, kmkernel->mainWin() );
+                                        transports, defaultIndex, false, &ok, kmkernel->mainWin() );
   if ( !ok )
     return TQString();
 
@@ -232,7 +232,7 @@ TQString Callback::receiver() const
     mReceiver =
       KInputDialog::getItem( i18n( "Select Address" ),
           selectMessage,
-          addrs+ccaddrs, defaultIndex, FALSE, &ok, kmkernel->mainWin() );
+          addrs+ccaddrs, defaultIndex, false, &ok, kmkernel->mainWin() );
     if( !ok )
       mReceiver = TQString();
   }
diff --git a/kmail/composer.h b/kmail/composer.h
index b02a2418..ba2ab035 100644
--- a/kmail/composer.h
+++ b/kmail/composer.h
@@ -83,7 +83,7 @@ namespace KMail {
   public: // kmkernel, callback
     /**
      * If this flag is set the message of the composer is deleted when
-     * the composer is closed and the message was not sent. Default: FALSE
+     * the composer is closed and the message was not sent. Default: false
      */
     virtual void setAutoDelete( bool f ) = 0;
 
diff --git a/kmail/folderstorage.h b/kmail/folderstorage.h
index 13f2ba0f..87d63d00 100644
--- a/kmail/folderstorage.h
+++ b/kmail/folderstorage.h
@@ -208,7 +208,7 @@ public:
       Emits msgAdded signals */
   void emitMsgAddedSignals(int idx);
 
-  /** Returns FALSE, if the message has to be retrieved from an IMAP account
+  /** Returns false, if the message has to be retrieved from an IMAP account
    * first. In this case this function does this and cares for the rest */
   virtual bool canAddMsgNow(KMMessage* aMsg, int* aIndex_ret);
 
@@ -310,14 +310,14 @@ public:
     on failure. */
   virtual int rename(const TQString& newName, KMFolderDir *aParent = 0);
 
-  /** Returns TRUE if a table of contents file is automatically created. */
+  /** Returns true if a table of contents file is automatically created. */
   bool autoCreateIndex() const { return mAutoCreateIndex; }
 
   /** Allow/disallow automatic creation of a table of contents file.
-    Default is TRUE. */
+    Default is true. */
   virtual void setAutoCreateIndex(bool);
 
-  /** Returns TRUE if the table of contents is dirty. This happens when
+  /** Returns true if the table of contents is dirty. This happens when
     a message is deleted from the folder. The toc will then be re-created
     when the folder is closed. */
   bool dirty() const { return mDirty; }
@@ -325,7 +325,7 @@ public:
   /** Change the dirty flag. */
   void setDirty(bool f);
 
-  /** Returns TRUE if the folder contains deleted messages */
+  /** Returns true if the folder contains deleted messages */
   bool needsCompacting() const { return needsCompact; }
   virtual void setNeedsCompacting(bool f) { needsCompact = f; }
 
@@ -618,7 +618,7 @@ friend class KMMsgDict;
   bool mExportsSernums :1;
   /** if the index is dirty it will be recreated upon close() */
   bool mDirty :1;
-  /** TRUE if the files of the folder are locked (writable) */
+  /** true if the files of the folder are locked (writable) */
   bool mFilesLocked :1;
 
   /** number of unread messages, -1 if not yet set */
diff --git a/kmail/imapaccountbase.h b/kmail/imapaccountbase.h
index 3c97567f..8bb5f097 100644
--- a/kmail/imapaccountbase.h
+++ b/kmail/imapaccountbase.h
@@ -187,7 +187,7 @@ namespace KMail {
     void removeJob( TDEIO::Job* job );
 
     /**
-     * Subscribe (@p subscribe = TRUE) / Unsubscribe the folder
+     * Subscribe (@p subscribe = true) / Unsubscribe the folder
      * identified by @p imapPath.
      * Emits subscriptionChanged signal on success.
      * Emits subscriptionChangeFailed signal when it fails.
@@ -202,7 +202,7 @@ namespace KMail {
     bool locallySubscribedTo( const TQString& imapPath );
 
     /**
-     * Locally subscribe (@p subscribe = TRUE) / Unsubscribe the folder
+     * Locally subscribe (@p subscribe = true) / Unsubscribe the folder
      * identified by @p imapPath.
      */
     void changeLocalSubscription( const TQString& imapPath, bool subscribe );
diff --git a/kmail/kmaccount.h b/kmail/kmaccount.h
index ce83bcb0..89d33dcc 100644
--- a/kmail/kmaccount.h
+++ b/kmail/kmaccount.h
@@ -132,7 +132,7 @@ public:
   virtual void setTrash(const TQString& aTrash) { mTrash = aTrash; }
 
   /**
-   * Process new mail for this account if one arrived. Returns TRUE if new
+   * Process new mail for this account if one arrived. Returns true if new
    * mail has been found. Whether the mail is automatically loaded to
    * an associated folder or not depends on the type of the account.
    */
diff --git a/kmail/kmacctimap.cpp b/kmail/kmacctimap.cpp
index 6ee04967..72f7c183 100644
--- a/kmail/kmacctimap.cpp
+++ b/kmail/kmacctimap.cpp
@@ -161,7 +161,7 @@ void KMAcctImap::killAllJobs( bool disconnectSlave )
       fld->quiet(false);
       fld->setContentState(KMFolderImap::imapNoInformation);
       fld->setSubfolderState(KMFolderImap::imapNoInformation);
-      fld->sendFolderComplete(FALSE);
+      fld->sendFolderComplete(false);
       fld->removeJobs();
     }
     if ( (*it).progressItem )
@@ -264,7 +264,7 @@ void KMAcctImap::cancelMailCheck()
   // KMAccount::checkingMail() to be reset, in case we restart checking mail later.
   for( TQValueList<KMFolderImap*>::Iterator it = folderList.begin(); it != folderList.end(); ++it ) {
     KMFolderImap *fld = *it;
-    fld->sendFolderComplete(FALSE);
+    fld->sendFolderComplete(false);
   }
 }
 
diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h
index 4c873800..54d4bf14 100644
--- a/kmail/kmcommands.h
+++ b/kmail/kmcommands.h
@@ -762,7 +762,7 @@ private:
 
   /** Returns a popupmenu containing a hierarchy of folder names.
       Each item in the popupmenu is connected to a slot, if
-      move is TRUE this slot will cause all selected messages to
+      move is true this slot will cause all selected messages to
       be moved into the given folder, otherwise messages will be
       copied.
       Am empty KMMenuToFolder must be passed in. */
diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h
index 942fc001..76f46060 100644
--- a/kmail/kmcomposewin.h
+++ b/kmail/kmcomposewin.h
@@ -157,8 +157,8 @@ public: // kmkernel, kmcommands, callback
    * Set the message the composer shall work with. This discards
    * previous messages without calling applyChanges() on them before.
    */
-   void setMsg(KMMessage* newMsg, bool mayAutoSign=TRUE,
-	       bool allowDecryption=FALSE, bool isModified=FALSE);
+   void setMsg(KMMessage* newMsg, bool mayAutoSign=true,
+	       bool allowDecryption=false, bool isModified=false);
 
    void disableWordWrap();
 
@@ -215,7 +215,7 @@ private:
 public: // kmkernel, callback
   /**
    * If this flag is set the message of the composer is deleted when
-   * the composer is closed and the message was not sent. Default: FALSE
+   * the composer is closed and the message was not sent. Default: false
    */
    inline void setAutoDelete(bool f) { mAutoDeleteMsg = f; }
 
@@ -235,7 +235,7 @@ public: // kmkernel, kmcommand, mailserviceimpl
   /**
    * Recode to the specified charset
    */
-   void setCharset(const TQCString& aCharset, bool forceDefault = FALSE);
+   void setCharset(const TQCString& aCharset, bool forceDefault = false);
 
 public: // kmcommand
   /**
@@ -527,7 +527,7 @@ signals:
 private:
   /**
    * Applies the user changes to the message object of the composer
-   * and signs/encrypts the message if activated. Returns FALSE in
+   * and signs/encrypts the message if activated. Returns false in
    * case of an error (e.g. if PGP encryption fails).
    * Disables the controls of the composer window unless @dontDisable
    * is true.
diff --git a/kmail/kmfilteraction.h b/kmail/kmfilteraction.h
index f0705b58..1242a1b3 100644
--- a/kmail/kmfilteraction.h
+++ b/kmail/kmfilteraction.h
@@ -107,7 +107,7 @@ public:
       quick test. Eg., actions that have a mail address as parameter
       shouldn't try real address validation, but only check if the
       string representation is empty. */
-  virtual bool isEmpty() const { return FALSE; }
+  virtual bool isEmpty() const { return false; }
 
   /** Creates a widget for setting the filter action parameter. Also
       sets the value of the widget. */
@@ -138,7 +138,7 @@ public:
 
   /** Called from the filter when a folder is removed.  Tests if the
       folder @p aFolder is used and changes to @p aNewFolder in this
-      case. Returns TRUE if a change was made.  */
+      case. Returns true if a change was made.  */
   virtual bool folderRemoved(KMFolder* aFolder, KMFolder* aNewFolder);
 
   /** Static function that creates a filter action of this type. */
@@ -431,7 +431,7 @@ public:
 
   /** Called from the filter when a folder is removed.  Tests if the
       folder @p aFolder is used and changes to @p aNewFolder in this
-      case. Returns TRUE if a change was made.  */
+      case. Returns true if a change was made.  */
   virtual bool folderRemoved(KMFolder* aFolder, KMFolder* aNewFolder);
 
 protected:
diff --git a/kmail/kmfiltermgr.h b/kmail/kmfiltermgr.h
index 70288a3a..a6805172 100644
--- a/kmail/kmfiltermgr.h
+++ b/kmail/kmfiltermgr.h
@@ -50,7 +50,7 @@ public:
   void readConfig(void);
 
   /** Store filter rules in config file. */
-  void writeConfig(bool withSync=TRUE);
+  void writeConfig(bool withSync=true);
   
   /** Open an edit dialog. If checkForEmptyFilterList is true, an empty filter
       is created to improve the visibility of the dialog in case no filter
@@ -157,7 +157,7 @@ public:
 
   /** Called from the folder manager when a folder is removed.
     Tests if the folder aFolder is used in any action. Changes
-    to aNewFolder folder in this case. Returns TRUE if a change
+    to aNewFolder folder in this case. Returns true if a change
     occurred. */
   bool folderRemoved(KMFolder* aFolder, KMFolder* aNewFolder);
 
diff --git a/kmail/kmfolder.h b/kmail/kmfolder.h
index d6160880..e1178ee0 100644
--- a/kmail/kmfolder.h
+++ b/kmail/kmfolder.h
@@ -124,7 +124,7 @@ public:
   void setAcctList( AccountList* list ) { mAcctList = list; }
   AccountList* acctList() { return mAcctList; }
 
-  /** Returns TRUE if accounts are associated with this folder. */
+  /** Returns true if accounts are associated with this folder. */
   bool hasAccounts() const { return (mAcctList != 0); }
 
   /** This is used by the storage to read the folder specific configuration */
diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp
index 3b7bcc0a..f7acebf6 100644
--- a/kmail/kmfoldercachedimap.cpp
+++ b/kmail/kmfoldercachedimap.cpp
@@ -2695,7 +2695,7 @@ void KMFolderCachedImap::updateAnnotationFolderType()
   if ( ( newType != oldType || newSubType != oldSubType ) && changingTypeAllowed ) {
     mAnnotationFolderType = newType + ( newSubType.isEmpty() ? TQString() : "."+newSubType );
     mAnnotationFolderTypeChanged = true; // force a "set annotation" on next sync
-    kdDebug(5006) << mImapPath << ": updateAnnotationFolderType: '" << mAnnotationFolderType << "', was (" << oldType << " " << oldSubType << ") => mAnnotationFolderTypeChanged set to TRUE" << endl;
+    kdDebug(5006) << mImapPath << ": updateAnnotationFolderType: '" << mAnnotationFolderType << "', was (" << oldType << " " << oldSubType << ") => mAnnotationFolderTypeChanged set to true" << endl;
   }
   // Ensure that further readConfig()s don't lose mAnnotationFolderType
   writeConfigKeysWhichShouldNotGetOverwrittenByReadConfig();
diff --git a/kmail/kmfolderdia.cpp b/kmail/kmfolderdia.cpp
index 0ddcc5a5..ac008ee1 100644
--- a/kmail/kmfolderdia.cpp
+++ b/kmail/kmfolderdia.cpp
@@ -88,7 +88,7 @@ KMFolderDialog::KMFolderDialog(KMFolder *aFolder, KMFolderDir *aFolderDir,
 			       const TQString& aName):
   KDialogBase( KDialogBase::Tabbed,
                aCap, KDialogBase::Ok|KDialogBase::Cancel,
-               KDialogBase::Ok, aParent, "KMFolderDialog", TRUE ),
+               KDialogBase::Ok, aParent, "KMFolderDialog", true ),
   mFolder( aFolder ),
   mFolderDir( aFolderDir ),
   mParentFolder( 0 ),
diff --git a/kmail/kmfolderdir.cpp b/kmail/kmfolderdir.cpp
index 541a8499..19baf48f 100644
--- a/kmail/kmfolderdir.cpp
+++ b/kmail/kmfolderdir.cpp
@@ -204,11 +204,11 @@ bool KMFolderDir::reload(void)
   dir.setFilter(TQDir::Files | TQDir::Dirs | TQDir::Hidden);
   dir.setNameFilter("*");
 
-  if (!dir.cd(fldPath, TRUE))
+  if (!dir.cd(fldPath, true))
   {
     TQString msg = i18n("<qt>Cannot enter folder <b>%1</b>.</qt>").arg(fldPath);
     KMessageBox::information(0, msg);
-    return FALSE;
+    return false;
   }
 
   TQFileInfoList* fiList=(TQFileInfoList*)dir.entryInfoList();
@@ -216,7 +216,7 @@ bool KMFolderDir::reload(void)
   {
     TQString msg = i18n("<qt>Folder <b>%1</b> is unreadable.</qt>").arg(fldPath);
     KMessageBox::information(0, msg);
-    return FALSE;
+    return false;
   }
 
   for (fileInfo=fiList->first(); fileInfo; fileInfo=fiList->next())
@@ -335,7 +335,7 @@ bool KMFolderDir::reload(void)
       addDirToParent( *it, folder );
     }
   }
-  return TRUE;
+  return true;
 }
 
 
diff --git a/kmail/kmfolderdir.h b/kmail/kmfolderdir.h
index 30bd529c..18f1cbc5 100644
--- a/kmail/kmfolderdir.h
+++ b/kmail/kmfolderdir.h
@@ -42,7 +42,7 @@ public:
   /** URL of the node for visualization purposes. */
   virtual TQString prettyURL() const;
 
-  /** Create a mail folder in this directory with given name. If sysFldr==TRUE
+  /** Create a mail folder in this directory with given name. If sysFldr==true
    the folder is marked as a (KMail) system folder.
    Returns Folder on success. */
   virtual KMFolder* createFolder( const TQString& folderName,
diff --git a/kmail/kmfolderimap.h b/kmail/kmfolderimap.h
index 8ca73c29..12f2928e 100644
--- a/kmail/kmfolderimap.h
+++ b/kmail/kmfolderimap.h
@@ -125,8 +125,8 @@ public:
   KMAcctImap* account() const;
 
   /** Remove (first occurrence of) given message from the folder. */
-  virtual void removeMsg(int i, bool quiet = FALSE);
-  virtual void removeMsg(const TQPtrList<KMMessage>& msgList, bool quiet = FALSE);
+  virtual void removeMsg(int i, bool quiet = false);
+  virtual void removeMsg(const TQPtrList<KMMessage>& msgList, bool quiet = false);
 
   virtual int rename( const TQString& newName, KMFolderDir *aParent = 0 );
 
@@ -152,12 +152,12 @@ public:
   /**
    * Retrieve all mails in a folder
    */
-  void getFolder(bool force = FALSE);
+  void getFolder(bool force = false);
 
   /**
    * same as above but also checks for new mails
    */
-  void getAndCheckFolder(bool force = FALSE);
+  void getAndCheckFolder(bool force = false);
 
   /**
    * Get the whole message
@@ -380,7 +380,7 @@ public slots:
    * Convert IMAP flags to a message status
    * @param newMsg specifies whether unseen messages are new or unread
    */
-  static void flagsToStatus(KMMsgBase *msg, int flags, bool newMsg = TRUE, int supportedFalgs = 31 );
+  static void flagsToStatus(KMMsgBase *msg, int flags, bool newMsg = true, int supportedFalgs = 31 );
 
   /**
    * Convert IMAP seen flag to a message status.
diff --git a/kmail/kmfolderindex.h b/kmail/kmfolderindex.h
index 194d5c97..1f4fb1b5 100644
--- a/kmail/kmfolderindex.h
+++ b/kmail/kmfolderindex.h
@@ -108,7 +108,7 @@ protected:
       failure. */
   virtual int createIndexFromContents() = 0;
 
-  bool updateIndexStreamPtr(bool just_close=FALSE);
+  bool updateIndexStreamPtr(bool just_close=false);
 
     /** Inserts messages into the message dictionary by iterating over the
      * message list. The messages will get new serial numbers. This is only
diff --git a/kmail/kmfoldermaildir.h b/kmail/kmfoldermaildir.h
index 85109490..83aced18 100644
--- a/kmail/kmfoldermaildir.h
+++ b/kmail/kmfoldermaildir.h
@@ -52,8 +52,8 @@ public:
   virtual int addMsg(KMMessage* msg, int* index_return = 0);
 
   /** Remove (first occurrence of) given message from the folder. */
-  virtual void removeMsg(int i, bool imapQuiet = FALSE);
-  virtual void removeMsg(TQPtrList<KMMessage> msgList, bool imapQuiet = FALSE)
+  virtual void removeMsg(int i, bool imapQuiet = false);
+  virtual void removeMsg(TQPtrList<KMMessage> msgList, bool imapQuiet = false)
   { return KMFolderIndex::removeMsg(msgList, imapQuiet); }
 
   // Called by KMMsgBase::setStatus when status of a message has changed
@@ -74,7 +74,7 @@ public:
   /** fsync buffers to disk */
   virtual void sync();
 
-  /** Close folder. If force is TRUE the files are closed even if
+  /** Close folder. If force is true the files are closed even if
     others still use it (e.g. other mail reader windows). */
   virtual void reallyDoClose(const char *owner);
 
diff --git a/kmail/kmfoldermbox.h b/kmail/kmfoldermbox.h
index 517d5f19..38348a15 100644
--- a/kmail/kmfoldermbox.h
+++ b/kmail/kmfoldermbox.h
@@ -149,7 +149,7 @@ protected:
 
 private:
   FILE *mStream;
-  bool mFilesLocked; // TRUE if the files of the folder are locked (writable)
+  bool mFilesLocked; // true if the files of the folder are locked (writable)
   bool mReadOnly; // true if locking failed
   LockType mLockType;
   TQString mProcmailLockFileName;
diff --git a/kmail/kmfoldermgr.cpp b/kmail/kmfoldermgr.cpp
index a0c4ee2c..3ff8f48b 100644
--- a/kmail/kmfoldermgr.cpp
+++ b/kmail/kmfoldermgr.cpp
@@ -44,7 +44,7 @@ KMFolderMgr::KMFolderMgr(const TQString& aBasePath, KMFolderDirType dirType):
   if ( dirType == KMStandardDir )
     mDir.setBaseURL( I18N_NOOP("Local Folders") );
   mQuiet = 0;
-  mChanged = FALSE;
+  mChanged = false;
   setBasePath(aBasePath);
   mRemoveOrig = 0;
 }
@@ -439,7 +439,7 @@ KMFolderRootDir& KMFolderMgr::dir(void)
 //-----------------------------------------------------------------------------
 void KMFolderMgr::contentsChanged(void)
 {
-  if (mQuiet) mChanged = TRUE;
+  if (mQuiet) mChanged = true;
   else emit changed();
 }
 
@@ -535,7 +535,7 @@ void KMFolderMgr::quiet(bool beQuiet)
     {
       mQuiet = 0;
       if (mChanged) emit changed();
-      mChanged = FALSE;
+      mChanged = false;
     }
   }
 }
diff --git a/kmail/kmfoldermgr.h b/kmail/kmfoldermgr.h
index cfafc916..02304ba2 100644
--- a/kmail/kmfoldermgr.h
+++ b/kmail/kmfoldermgr.h
@@ -32,8 +32,8 @@ public:
   KMFolderRootDir& dir();
 
   /** Searches folder and returns it. Skips directories
-    (objects of type KMFolderDir) if foldersOnly is TRUE. */
-  virtual KMFolder* find(const TQString& folderName, bool foldersOnly=TRUE);
+    (objects of type KMFolderDir) if foldersOnly is true. */
+  virtual KMFolder* find(const TQString& folderName, bool foldersOnly=true);
 
   /** Searches for a folder with the given id, recurses into directories */
   virtual KMFolder* findIdString(const TQString& folderId,
@@ -43,7 +43,7 @@ public:
    * created. Directories are skipped.
    * If an id is passed this searches for it
    */
-  virtual KMFolder* findOrCreate(const TQString& folderName, bool sysFldr=TRUE,
+  virtual KMFolder* findOrCreate(const TQString& folderName, bool sysFldr=true,
       const uint id = 0);
 
   /** Searches folder by id and returns it. Skips directories
@@ -59,7 +59,7 @@ public:
 
   /** Create a mail folder in the root folder directory dir()
     with given name. Returns Folder on success. */
-  virtual KMFolder* createFolder(const TQString& fName, bool sysFldr=FALSE,
+  virtual KMFolder* createFolder(const TQString& fName, bool sysFldr=false,
 				 KMFolderType aFolderType=KMFolderTypeMbox,
 				 KMFolderDir *aFolderDir = 0);
 
@@ -83,7 +83,7 @@ public:
  				 TQValueList<TQGuardedPtr<KMFolder> > *folders,
   				 KMFolderDir *adir,
   				 const TQString& prefix,
-				 bool i18nized=FALSE );
+				 bool i18nized=false );
 
   /** Create a list of formatted formatted folder labels and corresponding
    folders. The system folder names are translated */
diff --git a/kmail/kmfoldersearch.cpp b/kmail/kmfoldersearch.cpp
index 29c0c8ab..d5306b76 100644
--- a/kmail/kmfoldersearch.cpp
+++ b/kmail/kmfoldersearch.cpp
@@ -381,7 +381,7 @@ KMFolderSearch::~KMFolderSearch()
     delete mSearch;
     mSearch = 0;
     if (mOpenCount > 0)
-        close("~foldersearch", TRUE);
+        close("~foldersearch", true);
 }
 
 void KMFolderSearch::setSearch(KMSearch *search)
@@ -566,7 +566,7 @@ void KMFolderSearch::reallyDoClose(const char* owner)
     }
     mFolders.clear();
 
-    clearIndex(TRUE);
+    clearIndex(true);
 
     if (mIdsStream)
         fclose(mIdsStream);
@@ -779,8 +779,8 @@ int KMFolderSearch::writeIndex( bool )
     if (fclose(tmpIndexStream) != 0) return errno;
 
     ::rename(TQFile::encodeName(tempName), TQFile::encodeName(indexLocation()));
-    mDirty = FALSE;
-    mUnlinked = FALSE;
+    mDirty = false;
+    mUnlinked = false;
 
     return 0;
 }
diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h
index cc148f0f..ea3610bb 100644
--- a/kmail/kmkernel.h
+++ b/kmail/kmkernel.h
@@ -285,7 +285,7 @@ public:
                const KURL &messageFile, const KURL::List &attach,
                const QCStringList &customHeaders);
   void byteArrayToRemoteFile(const TQByteArray&, const KURL&,
-			     bool overwrite = FALSE);
+			     bool overwrite = false);
   bool folderIsDraftOrOutbox( const KMFolder * );
   bool folderIsDrafts( const KMFolder * );
   bool folderIsTemplates( const KMFolder * );
diff --git a/kmail/kmmessage.h b/kmail/kmmessage.h
index dfe96116..a96470df 100644
--- a/kmail/kmmessage.h
+++ b/kmail/kmmessage.h
@@ -114,7 +114,7 @@ public:
   KMMsgBase & toMsgBase() { return *this; }
   const KMMsgBase & toMsgBase() const { return *this; }
 
-  /** Returns TRUE if object is a real message (not KMMsgInfo or KMMsgBase) */
+  /** Returns true if object is a real message (not KMMsgInfo or KMMsgBase) */
   bool isMessage() const;
 
   /** @return whether the priority: or x-priority headers indicate
@@ -130,7 +130,7 @@ public:
   */
   void setUnencryptedMsg( KMMessage* unencrypted );
 
-  /** Returns TRUE if the message contains an unencrypted copy of itself. */
+  /** Returns true if the message contains an unencrypted copy of itself. */
   bool hasUnencryptedMsg() const { return 0 != mUnencryptedMsg; }
 
   /** Returns an unencrypted copy of this message or 0 if none exists. */
@@ -713,7 +713,7 @@ public:
                                  bool removeLineBreaks = false );
 
   /** Converts the email address(es) to (a) nice HTML mailto: anchor(s).
-   * If stripped is TRUE then the visible part of the anchor contains
+   * If stripped is true then the visible part of the anchor contains
    * only the name part and not the given emailAddr.
    */
   static TQString emailAddrAsAnchor(const TQString& emailAddr,
diff --git a/kmail/kmmsgbase.h b/kmail/kmmsgbase.h
index 1137bb6e..9ed08445 100644
--- a/kmail/kmmsgbase.h
+++ b/kmail/kmmsgbase.h
@@ -163,55 +163,55 @@ public:
   /** Convert the given message status to a string. */
   TQString statusToSortRank();
 
-  /** Returns TRUE if object is a real message (not KMMsgInfo or KMMsgBase) */
+  /** Returns true if object is a real message (not KMMsgInfo or KMMsgBase) */
   virtual bool isMessage(void) const;
 
-  /** Returns TRUE if status unread.  Note that new messages are not unread.*/
+  /** Returns true if status unread.  Note that new messages are not unread.*/
   virtual bool isUnread(void) const;
 
-  /** Returns TRUE if status is new. */
+  /** Returns true if status is new. */
   virtual bool isNew(void) const;
 
-  /** Returns TRUE if status is unknown. */
+  /** Returns true if status is unknown. */
   virtual bool isOfUnknownStatus(void) const;
 
-  /** Returns TRUE if status is old. */
+  /** Returns true if status is old. */
   virtual bool isOld(void) const;
 
-  /** Returns TRUE if status is read. */
+  /** Returns true if status is read. */
   virtual bool isRead(void) const;
 
-  /** Returns TRUE if status is deleted. */
+  /** Returns true if status is deleted. */
   virtual bool isDeleted(void) const;
 
-  /** Returns TRUE if status is replied. */
+  /** Returns true if status is replied. */
   virtual bool isReplied(void) const;
 
-  /** Returns TRUE if status is forwarded. */
+  /** Returns true if status is forwarded. */
   virtual bool isForwarded(void) const;
 
-  /** Returns TRUE if status is queued. */
+  /** Returns true if status is queued. */
   virtual bool isQueued(void) const;
 
-  /** Returns TRUE if status is todo flaged. */
+  /** Returns true if status is todo flaged. */
   virtual bool isTodo(void) const;
 
-  /** Returns TRUE if status is sent. */
+  /** Returns true if status is sent. */
   virtual bool isSent(void) const;
 
-  /** Returns TRUE if status is important. */
+  /** Returns true if status is important. */
   virtual bool isImportant(void) const;
 
-  /** Returns TRUE if status is watched. */
+  /** Returns true if status is watched. */
   virtual bool isWatched(void) const;
 
-  /** Returns TRUE if status is ignored. */
+  /** Returns true if status is ignored. */
   virtual bool isIgnored(void) const;
 
-  /** Returns TRUE if status is spam. */
+  /** Returns true if status is spam. */
   virtual bool isSpam(void) const;
 
-  /** Returns TRUE if status is not spam. */
+  /** Returns true if status is not spam. */
   virtual bool isHam(void) const;
 
 
@@ -275,7 +275,7 @@ public:
   virtual void setDate(const TQCString &aStrDate);
   virtual void setDate(time_t aUnixTime) = 0;
 
-  /** Returns TRUE if changed since last folder-sync. */
+  /** Returns true if changed since last folder-sync. */
   virtual bool dirty(void) const { return mDirty; }
 
   /** Change dirty flag. */
@@ -321,8 +321,8 @@ public:
 
   /** Skip leading keyword if keyword has given character at it's end
    * (e.g. ':' or ',') and skip the then following blanks (if any) too.
-   * If keywordFound is specified it will be TRUE if a keyword was skipped
-   * and FALSE otherwise. */
+   * If keywordFound is specified it will be true if a keyword was skipped
+   * and false otherwise. */
   static TQString skipKeyword(const TQString& str, TQChar sepChar=':',
 				 bool* keywordFound=0);
 
diff --git a/kmail/kmmsgdict.h b/kmail/kmmsgdict.h
index 60fabf6c..5598489c 100644
--- a/kmail/kmmsgdict.h
+++ b/kmail/kmmsgdict.h
@@ -115,7 +115,7 @@ private:
   /** Returns the name of the .folder.index.ids file. */
   static TQString getFolderIdsLocation( const FolderStorage &folder );
 
-  /** Returns TRUE if the .folder.index.ids file should not be read. */
+  /** Returns true if the .folder.index.ids file should not be read. */
   bool isFolderIdsOutdated( const FolderStorage &folder );
 
   /** Reads the .folder.index.ids file.  Returns 0 on success. */
diff --git a/kmail/kmmsginfo.h b/kmail/kmmsginfo.h
index 8f557f25..2a4a54fb 100644
--- a/kmail/kmmsginfo.h
+++ b/kmail/kmmsginfo.h
@@ -36,7 +36,7 @@ public:
   void compat_fromOldIndexString(const TQCString& str, bool toUtf8);
 
 
-  /** Initialize with given values and set dirty flag to FALSE. */
+  /** Initialize with given values and set dirty flag to false. */
   virtual void init(const TQCString& subject, const TQCString& from,
                     const TQCString& to, time_t date,
 		    KMMsgStatus status, const TQCString& xmark,
@@ -50,7 +50,7 @@ public:
 		    off_t folderOffset=0, size_t msgSize=0,
             size_t msgSizeServer = 0, ulong UID = 0);
 
-  /** Initialize with given values and set dirty flag to FALSE. */
+  /** Initialize with given values and set dirty flag to false. */
   virtual void init(const TQCString& subject, const TQCString& from,
                     const TQCString& to, time_t date,
 		    KMMsgStatus status, const TQCString& xmark,
diff --git a/kmail/kmmsglist.cpp b/kmail/kmmsglist.cpp
index 9689467b..c7781148 100644
--- a/kmail/kmmsglist.cpp
+++ b/kmail/kmmsglist.cpp
@@ -24,7 +24,7 @@ KMMsgList::KMMsgList(int initSize)
 //-----------------------------------------------------------------------------
 KMMsgList::~KMMsgList()
 {
-  clear(TRUE);
+  clear(true);
 }
 
 
@@ -69,22 +69,22 @@ bool KMMsgList::resize(unsigned int aSize)
   }
 
   // do the resizing
-  if (!TQMemArray<KMMsgBase*>::resize(aSize)) return FALSE;
+  if (!TQMemArray<KMMsgBase*>::resize(aSize)) return false;
 
   // initialize new elements
   for (i=oldSize; i<aSize; i++)
     at(i) = 0;
 
-  return TRUE;
+  return true;
 }
 
 
 //-----------------------------------------------------------------------------
 bool KMMsgList::reset(unsigned int aSize)
 {
-  if (!resize(aSize)) return FALSE;
+  if (!resize(aSize)) return false;
   clear();
-  return TRUE;
+  return true;
 }
 
 
diff --git a/kmail/kmmsglist.h b/kmail/kmmsglist.h
index 83d9e8db..04ff3176 100644
--- a/kmail/kmmsglist.h
+++ b/kmail/kmmsglist.h
@@ -64,13 +64,13 @@ public:
   /** Clear messages. If autoDelete is set (default) the messages are
       deleted. The array is not resized.  If @p syncDict, also updates
       the message dictionary. */
-  void clear(bool autoDelete=TRUE, bool syncDict = false);
+  void clear(bool autoDelete=true, bool syncDict = false);
 
   /** Resize array and initialize new elements if any. Returns
-    FALSE if memory cannot be allocated. */
+    false if memory cannot be allocated. */
   bool resize(unsigned int size);
 
-  /** Clear the array and resize it to given size. Returns FALSE
+  /** Clear the array and resize it to given size. Returns false
     if memory cannot be allocated. */
   bool reset(unsigned int size);
 
diff --git a/kmail/kmmsgpart.h b/kmail/kmmsgpart.h
index 452114d4..34939e51 100644
--- a/kmail/kmmsgpart.h
+++ b/kmail/kmmsgpart.h
@@ -137,9 +137,9 @@ public:
   void setContentId( const TQCString & aStr ) { mContentId = aStr; }
 
   /** Set the 'Content-Type' by mime-magic from the contents of the body.
-    If autoDecode is TRUE the decoded body will be used for mime type
+    If autoDecode is true the decoded body will be used for mime type
     determination (this does not change the body itself). */
-  void magicSetType(bool autoDecode=TRUE);
+  void magicSetType(bool autoDecode=true);
 
   /** Get or set a custom content type parameter, consisting of an attribute
     name and a corresponding value. */
diff --git a/kmail/kmmsgpartdlg.h b/kmail/kmmsgpartdlg.h
index 2cb9b114..29ccd318 100644
--- a/kmail/kmmsgpartdlg.h
+++ b/kmail/kmmsgpartdlg.h
@@ -142,7 +142,7 @@ class KMMsgPartDialogCompat : public KMMsgPartDialog {
   TQ_OBJECT
   
 public:
-  KMMsgPartDialogCompat( TQWidget * parent=0, const char * caption=0, bool=FALSE );
+  KMMsgPartDialogCompat( TQWidget * parent=0, const char * caption=0, bool=false );
   virtual ~KMMsgPartDialogCompat();
 
   /** Display information about this message part. */
diff --git a/kmail/kmreaderwin.h b/kmail/kmreaderwin.h
index fca9c3af..df4d8845 100644
--- a/kmail/kmreaderwin.h
+++ b/kmail/kmreaderwin.h
@@ -101,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 {
diff --git a/kmail/kmsearchpattern.h b/kmail/kmsearchpattern.h
index 9d517fdf..62058936 100644
--- a/kmail/kmsearchpattern.h
+++ b/kmail/kmsearchpattern.h
@@ -74,14 +74,14 @@ public:
   virtual ~KMSearchRule() {};
 
   /** Tries to match the rule against the given KMMessage.
-      @return TRUE if the rule matched, FALSE otherwise. Must be
+      @return true if the rule matched, false otherwise. Must be
       implemented by subclasses.
   */
   virtual bool matches( const KMMessage * msg ) const = 0;
 
    /** Optimized version tries to match the rule against the given
        @see DwString.
-       @return TRUE if the rule matched, FALSE otherwise.
+       @return true if the rule matched, false otherwise.
    */
    virtual bool matches( const DwString & str, KMMessage & msg,
                          const DwBoyerMoore * headerField=0,
@@ -170,7 +170,7 @@ public:
   virtual bool matches( const KMMessage * msg ) const;
 
   /** Optimized version tries to match the rule against the given  DwString.
-      @return TRUE if the rule matched, FALSE otherwise.
+      @return true if the rule matched, false otherwise.
   */
   virtual bool matches( const DwString & str, KMMessage & msg,
                         const DwBoyerMoore * headerField=0,
@@ -334,7 +334,7 @@ public:
       own result or else most functionality is lacking, or has to be
       reimplemented, since the rules are private to this class.
 
-      @return TRUE if the match was successful, FALSE otherwise.
+      @return true if the match was successful, false otherwise.
   */
   bool matches( const KMMessage * msg, bool ignoreBody = false ) const;
   bool matches( const DwString & str, bool ignoreBody = false ) const;
diff --git a/kmail/kmsender.h b/kmail/kmsender.h
index 955bab91..7e2cbf4e 100644
--- a/kmail/kmsender.h
+++ b/kmail/kmsender.h
@@ -66,10 +66,10 @@ protected:
   /** Send given message. The message is either queued or sent
     immediately. The default behaviour, as selected with
     setSendImmediate(), can be overwritten with the parameter
-    sendNow (by specifying TRUE or FALSE).
+    sendNow (by specifying true or false).
     The sender takes ownership of the given message on success,
     so DO NOT DELETE OR MODIFY the message further.
-    Returns TRUE on success. */
+    Returns true on success. */
   bool doSend(KMMessage* msg, short sendNow);
 
   /** Send queued messages, using the specified transport or the
@@ -78,11 +78,11 @@ protected:
   bool doSendQueued( const TQString& transport );
 
 private:
-  /** Returns TRUE if sending is in progress. */
+  /** Returns true if sending is in progress. */
   bool sending() const { return mSendInProgress; }
 
 public:
-  /** Shall messages be sent immediately (TRUE), or shall they be
+  /** Shall messages be sent immediately (true), or shall they be
     queued and sent later upon call of sendQueued() ? */
   bool sendImmediate() const { return mSendImmediate; }
   void setSendImmediate(bool);
@@ -139,8 +139,8 @@ private:
   void cleanup();
 
   /** Test if all required settings are set.
-      Reports problems to user via dialogs and returns FALSE.
-      Returns TRUE if everything is Ok. */
+      Reports problems to user via dialogs and returns false.
+      Returns true if everything is Ok. */
   bool settingsOk() const;
 
   /** Parse protocol '://' (host port? | mailer) string and
diff --git a/kmail/kmsender_p.h b/kmail/kmsender_p.h
index f3214eff..da2a2cbd 100644
--- a/kmail/kmsender_p.h
+++ b/kmail/kmsender_p.h
@@ -43,8 +43,8 @@ public:
   /** Abort sending the current message. Sets mSending to false */
   virtual void abort() = 0;
 
-  /** Returns TRUE if send was successful, and FALSE otherwise.
-      Returns FALSE if sending is still in progress. */
+  /** Returns true if send was successful, and false otherwise.
+      Returns false if sending is still in progress. */
   bool sendOk() const { return mSendOk; }
 
   /** Returns error message of last call of failed(). */
@@ -61,7 +61,7 @@ signals:
 protected:
   /** Called to signal a transmission error. The sender then
     calls finish() and terminates sending of messages.
-    Sets mSending to FALSE. */
+    Sets mSending to false. */
   void failed(const TQString &msg);
 
   /** Informs the user about what is going on. */
diff --git a/kmail/kmservertest.cpp b/kmail/kmservertest.cpp
index 9173d69c..1ef59a3f 100644
--- a/kmail/kmservertest.cpp
+++ b/kmail/kmservertest.cpp
@@ -63,7 +63,7 @@ KMServerTest::KMServerTest( const TQString & protocol, const TQString & host, in
 //-----------------------------------------------------------------------------
 KMServerTest::~KMServerTest()
 {
-  if (mJob) mJob->kill(TRUE);
+  if (mJob) mJob->kill(true);
 }
 
 
diff --git a/kmail/kmtransport.h b/kmail/kmtransport.h
index e6c05160..5f0efdee 100644
--- a/kmail/kmtransport.h
+++ b/kmail/kmtransport.h
@@ -67,7 +67,7 @@ class KMTransportSelDlg : public KDialogBase
   
 
 public:
-  KMTransportSelDlg( TQWidget *parent=0, const char *name=0, bool modal=TRUE );
+  KMTransportSelDlg( TQWidget *parent=0, const char *name=0, bool modal=true );
   int selected() const;
 
 private slots:
@@ -84,7 +84,7 @@ class KMTransportDialog : public KDialogBase
 
 public:
   KMTransportDialog( const TQString & caption, KMTransportInfo *transportInfo,
-		     TQWidget *parent=0, const char *name=0, bool modal=TRUE );
+		     TQWidget *parent=0, const char *name=0, bool modal=true );
   virtual ~KMTransportDialog();
 
 private slots:
diff --git a/kmail/mailserviceimpl.cpp b/kmail/mailserviceimpl.cpp
index 79af5eaf..cfd5a4a9 100644
--- a/kmail/mailserviceimpl.cpp
+++ b/kmail/mailserviceimpl.cpp
@@ -73,7 +73,7 @@ bool MailServiceImpl::sendMessage( const TQString& from, const TQString& to,
   if ( !body.isEmpty() )    msg->setBody( body.utf8() );
 
   KMail::Composer * cWin = KMail::makeComposer( msg );
-  cWin->setCharset("", TRUE);
+  cWin->setCharset("", true);
 
   cWin->addAttachmentsAndSend(attachments, "", 1);//send now
   return true;
@@ -116,7 +116,7 @@ bool MailServiceImpl::sendMessage( const TQString& from, const TQString& to,
   msg->addBodyPart( part );
 
   KMail::Composer * cWin = KMail::makeComposer( msg );
-  cWin->setCharset("", TRUE);
+  cWin->setCharset("", true);
   return true;
 }
 
diff --git a/kmail/main.cpp b/kmail/main.cpp
index 1f2d33ee..24de19cd 100644
--- a/kmail/main.cpp
+++ b/kmail/main.cpp
@@ -60,7 +60,7 @@ int KMailApplication::newInstance()
 
   if (!kmkernel->firstInstance() || !tdeApp->isRestored())
     kmkernel->handleCommandLine( true );
-  kmkernel->setFirstInstance(FALSE);
+  kmkernel->setFirstInstance(false);
   return 0;
 }
 
diff --git a/kmail/messagecomposer.h b/kmail/messagecomposer.h
index 924b5bf4..24123759 100644
--- a/kmail/messagecomposer.h
+++ b/kmail/messagecomposer.h
@@ -77,7 +77,7 @@ public:
 
   /**
    * Applies the user changes to the message object of the composer
-   * and signs/encrypts the message if activated. Returns FALSE in
+   * and signs/encrypts the message if activated. Returns false in
    * case of an error (e.g. if PGP encryption fails).
    * If backgroundMode is true then no functions which might require
    * user interaction (like signing/encrypting) are performed
diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp
index a93c89c9..de0faee2 100644
--- a/kmail/objecttreeparser.cpp
+++ b/kmail/objecttreeparser.cpp
@@ -609,7 +609,7 @@ namespace KMail {
       if ( key.numUserIDs() > 0 && key.userID( 0 ).id() )
         messagePart.signer = Kleo::DN( key.userID( 0 ).id() ).prettyDN();
       for ( uint iMail = 0; iMail < key.numUserIDs(); ++iMail ) {
-        // The following if /should/ always result in TRUE but we
+        // The following if /should/ always result in true but we
         // won't trust implicitely the plugin that gave us these data.
         if ( key.userID( iMail ).email() ) {
           TQString email = TQString::fromUtf8( key.userID( iMail ).email() );
@@ -2982,7 +2982,7 @@ TQString ObjectTreeParser::quotedHTML( const TQString& s, bool decorate )
     TQString line;
 
     /* search next occurrence of '\n' */
-    pos = s.find('\n', beg, FALSE);
+    pos = s.find('\n', beg, false);
     if (pos == (unsigned int)(-1))
         pos = length;
 
diff --git a/kmail/popaccount.h b/kmail/popaccount.h
index ef329982..cb68ab38 100644
--- a/kmail/popaccount.h
+++ b/kmail/popaccount.h
@@ -47,8 +47,8 @@ public:
   virtual void setUsePipelining(bool);
  
   /**
-   * Shall messages be left on the server upon retreival (TRUE)
-   * or deleted (FALSE).
+   * Shall messages be left on the server upon retreival (true)
+   * or deleted (false).
    */
   bool leaveOnServer(void) const { return mLeaveOnServer; }
   virtual void setLeaveOnServer(bool);
@@ -72,8 +72,8 @@ public:
   virtual void setLeaveOnServerSize(int);
 
   /**
-   * Shall messages be filter on the server (TRUE)
-   * or not (FALSE).
+   * Shall messages be filter on the server (true)
+   * or not (false).
    */
   bool filterOnServer(void) const { return mFilterOnServer; }
   virtual void setFilterOnServer(bool);
diff --git a/kmail/snippetdlg.cpp b/kmail/snippetdlg.cpp
index 088b39c8..7e1df3b7 100644
--- a/kmail/snippetdlg.cpp
+++ b/kmail/snippetdlg.cpp
@@ -30,7 +30,7 @@
  *  name 'name' and widget flags set to 'f'.
  *
  *  The dialog will by default be modeless, unless you set 'modal' to
- *  TRUE to construct a modal dialog.
+ *  true to construct a modal dialog.
  */
 SnippetDlg::SnippetDlg( TDEActionCollection* ac, TQWidget* parent, const char* name, bool modal, WFlags fl )
     : SnippetDlgBase( parent, name, modal, fl ), actionCollection( ac )
diff --git a/kmail/snippetdlg.h b/kmail/snippetdlg.h
index 3717cc86..8ae34df4 100644
--- a/kmail/snippetdlg.h
+++ b/kmail/snippetdlg.h
@@ -22,7 +22,7 @@ class SnippetDlg : public SnippetDlgBase
   
 
   public:
-    SnippetDlg( TDEActionCollection* ac, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+    SnippetDlg( TDEActionCollection* ac, TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 );
     ~SnippetDlg();
 
     void setShowShortcut( bool show );
diff --git a/kmail/snippetwidget.cpp b/kmail/snippetwidget.cpp
index c0851121..406632b6 100644
--- a/kmail/snippetwidget.cpp
+++ b/kmail/snippetwidget.cpp
@@ -49,7 +49,7 @@ SnippetWidget::SnippetWidget(KMEdit* editor, TDEActionCollection* actionCollecti
 		mEditor( editor ), mActionCollection( actionCollection )
 {
     // init the TQPtrList
-    _list.setAutoDelete(TRUE);
+    _list.setAutoDelete(true);
 
     // init the TDEListView
     setSorting( -1 );
@@ -263,7 +263,7 @@ void SnippetWidget::slotEdit( TQListViewItem* item )
       pSnippet->resetParent();
     }
 
-    setSelected(item, TRUE);
+    setSelected(item, true);
   }
 }
 
@@ -286,7 +286,7 @@ void SnippetWidget::slotEditGroup()
   dlg.snippetName->setText(pGroup->getName());
   dlg.snippetText->setText(pGroup->getText());
   dlg.btnAdd->setText(i18n("&Apply"));
-  dlg.snippetText->setEnabled(FALSE);
+  dlg.snippetText->setEnabled(false);
   dlg.setCaption(i18n("Edit Group"));
   dlg.cbGroup->insertItem(i18n("All"));
 
@@ -295,7 +295,7 @@ void SnippetWidget::slotEditGroup()
     item->setText( 0, dlg.snippetName->text() );
     pGroup->setName( dlg.snippetName->text() );
 
-    setSelected(item, TRUE);
+    setSelected(item, true);
   }
 }
 
@@ -683,7 +683,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
       continue;
 
     cb = new TQCheckBox( &dlg, "cbVar" );
-    cb->setChecked( FALSE );
+    cb->setChecked( false );
     cb->setText(it.key());
     layoutVar->addWidget( cb, i ,0, TQt::AlignTop );
 
@@ -691,7 +691,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
     layoutVar->addWidget( te, i, 1, TQt::AlignTop );
 
     if ((*mapSave)[it.key()].length() > 0) {
-      cb->setChecked( TRUE );
+      cb->setChecked( true );
       te->setText((*mapSave)[it.key()]);
     }
 
@@ -713,7 +713,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
   layoutBtn->addWidget( btn1, 0, 0 );
 
   KPushButton * btn2 = new KPushButton( KStdGuiItem::apply(), &dlg, "pushButton2" );
-  btn2->setDefault( TRUE );
+  btn2->setDefault( true );
   btn2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
                          btn2->sizePolicy().hasHeightForWidth() ) );
   layoutBtn->addWidget( btn2, 0, 1 );
@@ -804,14 +804,14 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
 
 
   cb = new TQCheckBox( &dlg, "cbVar" );
-  cb->setChecked( FALSE );
+  cb->setChecked( false );
   cb->setText(i18n( "Make value &default" ));
 
   te = new KTextEdit( &dlg, "teVar" );
   layoutVar->addWidget( te, 0, 1, TQt::AlignTop);
   layoutVar->addWidget( cb, 1, 1, TQt::AlignTop);
   if ((*mapSave)[var].length() > 0) {
-    cb->setChecked( TRUE );
+    cb->setChecked( true );
     te->setText((*mapSave)[var]);
   }
 
@@ -826,7 +826,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
   layoutBtn->addWidget( btn1, 0, 0 );
 
   KPushButton * btn2 = new KPushButton( KStdGuiItem::apply(), &dlg, "pushButton2" );
-  btn2->setDefault( TRUE );
+  btn2->setDefault( true );
   layoutBtn->addWidget( btn2, 0, 1 );
 
   layout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 );
@@ -882,18 +882,18 @@ bool SnippetWidget::acceptDrag (TQDropEvent *event) const
   if (item &&
       TQString(event->format()).startsWith("text/plain") &&
       static_cast<SnippetWidget *>(event->source()) != this) {
-    ///kdDebug(5006) << "returning TRUE " << endl;
-    return TRUE;
+    ///kdDebug(5006) << "returning true " << endl;
+    return true;
   } else if(item &&
       TQString(event->format()).startsWith("x-kmailsnippet") &&
       static_cast<SnippetWidget *>(event->source()) != this)
   {
-    //kdDebug(5006) << "returning TRUE " << endl;
-    return TRUE;
+    //kdDebug(5006) << "returning true " << endl;
+    return true;
   } else {
-    //kdDebug(5006) << "returning FALSE" << endl;
-    event->acceptAction(FALSE);
-    return FALSE;
+    //kdDebug(5006) << "returning false" << endl;
+    event->acceptAction(false);
+    return false;
   }
 }
 
diff --git a/kmail/treebase.cpp b/kmail/treebase.cpp
index 97d43b5d..f9b88c82 100644
--- a/kmail/treebase.cpp
+++ b/kmail/treebase.cpp
@@ -86,7 +86,7 @@ void TreeBase::slotContextMenuRequested( TQListViewItem *lvi,  const TQPoint &p
       if (!lvi)
         return;
         setCurrentItem( lvi );
-        setSelected( lvi, TRUE );
+        setSelected( lvi, true );
 
       const KMFolder * folder = dynamic_cast<TreeItemBase*>( lvi )->folder();
       if ( !folder || folder->noContent() || folder->noChildren() )