some mail fixes and warnings removed

12 files changed, 46 insertions, 35 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index d651224..c339244 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2744,5 +2744,5 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
             if ( !inL.isEmpty() ) { // maybe conflict - same uid in both calendars
                 if ( !inL.resource() || inL.resource()->includeInSync() ) {
-                    if ( take = takeAddressee( &inL, &inR, mode, fullDateRange ) ) {
+                    if ( (take = takeAddressee( &inL, &inR, mode, fullDateRange )) ) {
                         //qDebug("take %d %s ", take, inL.summary().latin1());
                         if ( take == 3 )
diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp
index da552c3..03df444 100644
--- a/kaddressbook/views/cardview.cpp
+++ b/kaddressbook/views/cardview.cpp
@@ -155,7 +155,7 @@ class CardViewPrivate
        mCurrentItem( 0L ),
        mLastClickPos( QPoint(0, 0) ),
+       mResizeAnchor(0),
        mRubberBandAnchor( 0 ),
-       mCompText( QString::null ),
-       mResizeAnchor(0)
+       mCompText( QString::null )
     {};
 
@@ -202,7 +202,7 @@ class CardViewItemPrivate
   public:
     CardViewItemPrivate() :
-    x( 0 ),
-    y( 0 ),
-    mSelected( false ){};
+        mSelected( false ),
+        x( 0 ),
+        y( 0 ){};
         
 
diff --git a/kmicromail/koprefsdialog.cpp b/kmicromail/koprefsdialog.cpp
index 4abf859..13d6681 100644
--- a/kmicromail/koprefsdialog.cpp
+++ b/kmicromail/koprefsdialog.cpp
@@ -148,9 +148,10 @@ void KOPrefsDialog::setupMailTab()
                     &(KOPrefs::instance()->mSendLater),topFrame);
   topLayout->addMultiCellWidget(ttt->checkBox(),1,1,0,1);
+  /*
   mCodecEdit = new QLineEdit(topFrame);
   topLayout->addMultiCellWidget( new QLabel(mCodecEdit, i18n("User defined codec for new mails:"), topFrame),2,2,0,1);
   topLayout->addMultiCellWidget(mCodecEdit,3,3,0,1);
   topLayout->addMultiCellWidget( new QLabel(0, i18n("Example: iso-8859-15"), topFrame),4,4,0,1);
-
+  */
 }
 void KOPrefsDialog::setupFontsTab()
@@ -199,5 +200,5 @@ void KOPrefsDialog::usrReadConfig()
   mNameEdit->setText(KOPrefs::instance()->mName);
   mEmailEdit->setText(KOPrefs::instance()->mEmail);
-  mCodecEdit->setText(KOPrefs::instance()->mSendCodec);
+  //mCodecEdit->setText(KOPrefs::instance()->mSendCodec);
   kdelibcfg->readConfig();
 }
@@ -206,5 +207,5 @@ void KOPrefsDialog::usrWriteConfig()
     KOPrefs::instance()->mName = mNameEdit->text();
     KOPrefs::instance()->mEmail = mEmailEdit->text();
-    KOPrefs::instance()->mSendCodec = mCodecEdit->text();
+    //KOPrefs::instance()->mSendCodec = mCodecEdit->text();
     kdelibcfg->writeConfig();
  
diff --git a/kmicromail/libmailwrapper/generatemail.cpp b/kmicromail/libmailwrapper/generatemail.cpp
index 32311d7..2d213fe 100644
--- a/kmicromail/libmailwrapper/generatemail.cpp
+++ b/kmicromail/libmailwrapper/generatemail.cpp
@@ -14,4 +14,5 @@ const char* Generatemail::USER_AGENT="KOpieMail 33 1/3";
 Generatemail::Generatemail()
 {
+    mCharset = "iso-8859-1";
 }
 
@@ -146,5 +147,5 @@ mailmime *Generatemail::buildFilePart(const QString&filename,const QString&mimet
     if ( mimetype.startsWith( "text/" ) ) {
         param = mailmime_parameter_new( strdup( "charset" ),
-                                        strdup( "iso-8859-1" ) );
+                                        strdup( mCharset.latin1() ) );
         mechanism = MAILMIME_MECHANISM_QUOTED_PRINTABLE;
     }
@@ -171,5 +172,6 @@ mailmime *Generatemail::buildFilePart(const QString&filename,const QString&mimet
             err = mailmime_set_body_file( filePart, file );
         } else {
-            err = mailmime_set_body_text(filePart,strdup( TextContent.utf8()),TextContent.utf8().length());
+            err = mailmime_set_body_text(filePart,strdup( TextContent.utf8().data()),TextContent.utf8().length()); 
+            //err = mailmime_set_body_text(filePart,strdup( TextContent.latin1()),TextContent.length());
         }
         if (err != MAILIMF_NO_ERROR) {
@@ -228,6 +230,7 @@ mailmime *Generatemail::buildTxtPart(const QString&str ) {
     int err;
     QCString __str;
+    //qDebug(" Generatemail::buildTxtPart %s", str.latin1());
     param = mailmime_parameter_new( strdup( "charset" ),
-                                    strdup( "iso-8859-1" ) );
+                                    strdup( mCharset.latin1() ) );
     if ( param == NULL )
         goto err_free;
@@ -249,6 +252,7 @@ mailmime *Generatemail::buildTxtPart(const QString&str ) {
         goto err_free_fields;
     {
-        __str = str.utf8();
-        err = mailmime_set_body_text( txtPart, __str.data(), __str.length() );
+        //__str = str.utf8();
+        __str = QCString (str.latin1());
+        err = mailmime_set_body_text( txtPart, strdup(__str.data()), __str.length() );
     }
     if ( err != MAILIMF_NO_ERROR )
@@ -399,4 +403,6 @@ mailmime *Generatemail::createMimeMail(const Opie::Core::OSmartPointer<Mail> &ma
     int err;
 
+    //LR disabled for now
+    //mCharset = mail->getCharset().lower();
     fields = createImfFields( mail );
     if ( fields == NULL )
diff --git a/kmicromail/libmailwrapper/generatemail.h b/kmicromail/libmailwrapper/generatemail.h
index b9f8285..a9fb648 100644
--- a/kmicromail/libmailwrapper/generatemail.h
+++ b/kmicromail/libmailwrapper/generatemail.h
@@ -43,4 +43,5 @@ protected:
 
     static const char* USER_AGENT;
+    QString mCharset;
 };
 
diff --git a/kmicromail/libmailwrapper/genericwrapper.cpp b/kmicromail/libmailwrapper/genericwrapper.cpp
index 28d45ce..eac05e5 100644
--- a/kmicromail/libmailwrapper/genericwrapper.cpp
+++ b/kmicromail/libmailwrapper/genericwrapper.cpp
@@ -226,5 +226,6 @@ void Genericwrapper::traverseBody(RecBodyP&target,mailmessage*message,mailmime*m
             QString charset = part->searchParamter( "charset");
             qDebug("CHARSET %s ",charset.latin1() );
-            if ( !charset.isEmpty() ) {
+            if (false ) {
+                //if ( !charset.isEmpty() ) {
                 target->setCharset( charset );
                 err = mailmime_encoded_phrase_parse(charset.latin1(),
diff --git a/kmicromail/libmailwrapper/imapwrapper.cpp b/kmicromail/libmailwrapper/imapwrapper.cpp
index 2a54381..da7065f 100644
--- a/kmicromail/libmailwrapper/imapwrapper.cpp
+++ b/kmicromail/libmailwrapper/imapwrapper.cpp
@@ -760,6 +760,6 @@ void IMAPwrapper::traverseBody(const RecMailP&mail,mailimap_body*body,RecBodyP&t
             QString charset = currentPart->searchParamter( "charset");
             qDebug("CHARSET %s ",charset.latin1() );
-            //if ( false ) {
-            if ( !charset.isEmpty() ) {
+            if ( false ) {
+            //if ( !charset.isEmpty() ) {
                 target_body->setCharset( charset );
                 //err = mailmime_encoded_phrase_parse("iso-8859-1",
diff --git a/kmicromail/libmailwrapper/mailwrapper.h b/kmicromail/libmailwrapper/mailwrapper.h
index ea6bf36..3e8b51f 100644
--- a/kmicromail/libmailwrapper/mailwrapper.h
+++ b/kmicromail/libmailwrapper/mailwrapper.h
@@ -84,5 +84,5 @@ public:
 
     void setCharset( const QString&a ) { charset= a; }
-    const QString& getCharset() { return charset; }
+    const QString& getCharset() const { return charset; }
 
 private:
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index 3013931..8c0a4cb 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -108,5 +108,6 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     codecMenu->insertItem( "Unicode (utf-8)",4,4);
     codecMenu->insertItem( "Userdefined ("+KOPrefs::instance()->mSendCodec+")",5,5);
-    settingsMenu->insertItem( i18n("Codec for new mails"), codecMenu);
+    //disabled
+    //settingsMenu->insertItem( i18n("Codec for new mails"), codecMenu);
     //setCentralWidget( view );
 
diff --git a/microkde/kdecore/klocale.cpp b/microkde/kdecore/klocale.cpp
index 1da1e99..d7e384c 100644
--- a/microkde/kdecore/klocale.cpp
+++ b/microkde/kdecore/klocale.cpp
@@ -869,21 +869,22 @@ QString KLocale::timeFormat(IntDateFormat intIntTimeFormat) const
  
     if ( tformat == Default )
-      if ( mHourF24Format)
-	return "%H:%M:%S";
-      else
-	return "%I:%M:%S%p";
+        if ( mHourF24Format)
+            return "%H:%M:%S";
+        else
+            return "%I:%M:%S%p";
 
     else  if ( tformat == Format1 )
-      if ( mHourF24Format)
-        return "%H:%M:%S";
-      else
-	return "%I:%M:%S%p";
+        if ( mHourF24Format)
+            return "%H:%M:%S";
+        else
+            return "%I:%M:%S%p";
 
     else  if ( tformat == ISODate )  // = Qt::ISODate
-      if ( mHourF24Format)
-        return "%H:%M:%S";
-      else
-	return "%I:%M:%S%p";
-
+        if ( mHourF24Format)
+            return "%H:%M:%S";
+        else
+            return "%I:%M:%S%p";
+    // to satisfy the compiler
+    return "%H:%M:%S";
 }
 
diff --git a/microkde/kidmanager.cpp b/microkde/kidmanager.cpp
index 8cf486a..e687e5d 100644
--- a/microkde/kidmanager.cpp
+++ b/microkde/kidmanager.cpp
@@ -122,5 +122,5 @@ bool KIdManager::getNumbers (const QString& idString,const QString& prof, int &s
             }
             else {
-                qDebug("Error getNumbers:length is no number:*%s* ", idString.mid ( startIDnum,startIDnumlen).toInt( &ok ));
+                qDebug("Error getNumbers:length is no number:*%s* ", idString.mid ( startIDnum,startIDnumlen).latin1());
                 return false;
             }
diff --git a/microkde/kresources/managerimpl.cpp b/microkde/kresources/managerimpl.cpp
index 5bd9eb7..566b8f4 100644
--- a/microkde/kresources/managerimpl.cpp
+++ b/microkde/kresources/managerimpl.cpp
@@ -158,5 +158,5 @@ void ManagerImpl::writeConfig( KConfig *cfg )
 void ManagerImpl::add( Resource *resource, bool useDCOP )
 {
-qDebug("ManagerImpl::add begin this= %ul resource=%ul", this, resource);
+    //qDebug("ManagerImpl::add begin this= %ul resource=%ul", this, resource);
 
   resource->setActive( true );
@@ -170,5 +170,5 @@ qDebug("ManagerImpl::add begin this= %ul resource=%ul", this, resource);
   writeResourceConfig( resource, true );
 
-  qDebug("ManagerImpl::add end this= %ul resource=%ul", this, resource);
+  //qDebug("ManagerImpl::add end this= %ul resource=%ul", this, resource);
 
 }