CVS commit by thorsen: Add copyright and license info, and fix a couple of things in the header M +30 -0 composemessage.cpp 1.1.2.2 M +33 -2 composemessage.h 1.1.2.3 --- kdepim/kmail/composemessage.h #1.1.2.2:1.1.2.3 @@ -1,2 +1,32 @@ +/** + * composemessage.cpp + * + * Copyright (c) 2004 Bo Thorsen + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * In addition, as a special exception, the copyright holders give + * permission to link the code of this program with any edition of + * the Qt library by Trolltech AS, Norway (or with modified versions + * of Qt that use the same license as Qt), and distribute linked + * combinations including the two. You must obey the GNU General + * Public License in all respects for all of the code used other than + * Qt. If you modify this file, you may extend this exception to + * your version of the file, but you are not obligated to do so. If + * you do not wish to do so, delete this exception statement from + * your version. + */ + #ifndef COMPOSEMESSAGE_H #define COMPOSEMESSAGE_H @@ -27,5 +57,5 @@ public: * user interaction (like signing/encrypting) are performed */ - bool applyChanges( bool backgroundMode = false ); + void applyChanges( bool backgroundMode = false ); QString originalBCC() const { return mBcc; } @@ -119,5 +149,5 @@ private slots: private: - KMComposeWin* win; + KMComposeWin* mComposeWin; CryptPlugWrapper* mSelectedCryptPlug; @@ -127,4 +157,5 @@ private: QString mErrorProcessingStructuringInfo; QString mErrorNoCryptPlugAndNoBuildIn; + bool mDebugComposerCrypto; }; --- kdepim/kmail/composemessage.cpp #1.1.2.1:1.1.2.2 @@ -1,2 +1,32 @@ +/** + * composemessage.cpp + * + * Copyright (c) 2004 Bo Thorsen + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * In addition, as a special exception, the copyright holders give + * permission to link the code of this program with any edition of + * the Qt library by Trolltech AS, Norway (or with modified versions + * of Qt that use the same license as Qt), and distribute linked + * combinations including the two. You must obey the GNU General + * Public License in all respects for all of the code used other than + * Qt. If you modify this file, you may extend this exception to + * your version of the file, but you are not obligated to do so. If + * you do not wish to do so, delete this exception statement from + * your version. + */ + #include "composemessage.h" #include "kmmsgpart.h"