now we depend against grantlee >= 0.3

CMakeLists.txt

@@ -2,9 +2,6 @@ project(kmail)
 
 include(CheckIncludeFiles)
 
-if(GRANTLEE_GREATER_0_2)
-  add_definitions(-DGRANTLEE_GREATER_0_2)
-endif()
 
 if (NOT WINCE)
 

configuredialog.cpp

@@ -2251,15 +2251,8 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( QWidget * parent )
 
   mImprovePlainTextOfHtmlMessage = new QCheckBox( MessageComposer::MessageComposerSettings::self()->improvePlainTextOfHtmlMessageItem()->label(), this );
   vlay->addWidget( mImprovePlainTextOfHtmlMessage );
-#ifdef GRANTLEE_GREATER_0_2
   connect( mImprovePlainTextOfHtmlMessage, SIGNAL(stateChanged(int)),
            this, SLOT(slotEmitChanged()) );
-#else
-  mImprovePlainTextOfHtmlMessage->setWhatsThis(
-                 i18n( "To support improving the plain text of HTML messages, KMail must be compiled "
-                       "with Grantlee 0.3 or greater." ) );
-  mImprovePlainTextOfHtmlMessage->setEnabled(false);
-#endif
 
   mQuoteSelectionOnlyCheck = new QCheckBox( MessageComposer::MessageComposerSettings::self()->quoteSelectionOnlyItem()->label(),
                                             this );

kmcomposewin.cpp

@@ -2921,7 +2921,6 @@ void KMComposeWin::enableHtml()
 void KMComposeWin::disableHtml( Message::ComposerViewBase::Confirmation confirmation )
 {
   bool forcePlainTextMarkup = false;
-#ifdef GRANTLEE_GREATER_0_2
   if ( confirmation == Message::ComposerViewBase::LetUserConfirm && mComposerBase->editor()->isFormattingUsed() && !mForceDisableHtml ) {
     int choice = KMessageBox::warningYesNoCancel( this, i18n( "Turning HTML mode off "
         "will cause the text to lose the formatting. Are you sure?" ),
@@ -2939,18 +2938,6 @@ void KMComposeWin::disableHtml( Message::ComposerViewBase::Confirmation confirma
         break;
     }
   }
-#else
-  if ( confirmation == Message::ComposerViewBase::LetUserConfirm && mComposerBase->editor()->isFormattingUsed() && !mForceDisableHtml ) {
-    int choice = KMessageBox::warningContinueCancel( this, i18n( "Turning HTML mode off "
-        "will cause the text to lose the formatting. Are you sure?" ),
-        i18n( "Lose the formatting?" ), KGuiItem( i18n( "Lose Formatting" ) ), KStandardGuiItem::cancel(),
-              "LoseFormattingWarning" );
-    if ( choice != KMessageBox::Continue ) {
-      enableHtml();
-      return;
-    }
-  }
-#endif
 
   mComposerBase->editor()->forcePlainTextMarkup(forcePlainTextMarkup);
   mComposerBase->editor()->switchToPlainText();