Commit 7c0920ac authored by Laurent Montel's avatar Laurent Montel 😁

Remove not necessary lines

parent 2dfa9e8d
...@@ -81,7 +81,7 @@ KMReaderMainWin::KMReaderMainWin(MessageViewer::Viewer::DisplayFormatMessage for ...@@ -81,7 +81,7 @@ KMReaderMainWin::KMReaderMainWin(MessageViewer::Viewer::DisplayFormatMessage for
} }
//-----------------------------------------------------------------------------
KMReaderMainWin::KMReaderMainWin( char *name ) KMReaderMainWin::KMReaderMainWin( char *name )
: KMail::SecondaryWindow( name ? name : "readerwindow#" ) : KMail::SecondaryWindow( name ? name : "readerwindow#" )
{ {
...@@ -90,7 +90,7 @@ KMReaderMainWin::KMReaderMainWin( char *name ) ...@@ -90,7 +90,7 @@ KMReaderMainWin::KMReaderMainWin( char *name )
} }
//-----------------------------------------------------------------------------
KMReaderMainWin::KMReaderMainWin(KMime::Content* aMsgPart, MessageViewer::Viewer::DisplayFormatMessage format, const QString & encoding, char *name ) KMReaderMainWin::KMReaderMainWin(KMime::Content* aMsgPart, MessageViewer::Viewer::DisplayFormatMessage format, const QString & encoding, char *name )
: KMail::SecondaryWindow( name ? name : "readerwindow#" ) : KMail::SecondaryWindow( name ? name : "readerwindow#" )
{ {
...@@ -101,7 +101,7 @@ KMReaderMainWin::KMReaderMainWin(KMime::Content* aMsgPart, MessageViewer::Viewer ...@@ -101,7 +101,7 @@ KMReaderMainWin::KMReaderMainWin(KMime::Content* aMsgPart, MessageViewer::Viewer
initKMReaderMainWin(); initKMReaderMainWin();
} }
//-----------------------------------------------------------------------------
void KMReaderMainWin::initKMReaderMainWin() void KMReaderMainWin::initKMReaderMainWin()
{ {
setCentralWidget( mReaderWin ); setCentralWidget( mReaderWin );
...@@ -119,13 +119,13 @@ void KMReaderMainWin::initKMReaderMainWin() ...@@ -119,13 +119,13 @@ void KMReaderMainWin::initKMReaderMainWin()
statusBar(), SLOT(showMessage(QString)) ); statusBar(), SLOT(showMessage(QString)) );
} }
//-----------------------------------------------------------------------------
KMReaderMainWin::~KMReaderMainWin() KMReaderMainWin::~KMReaderMainWin()
{ {
saveMainWindowSettings( KMKernel::self()->config()->group( "Separate Reader Window" ) ); saveMainWindowSettings( KMKernel::self()->config()->group( "Separate Reader Window" ) );
} }
//-----------------------------------------------------------------------------
void KMReaderMainWin::setUseFixedFont( bool useFixedFont ) void KMReaderMainWin::setUseFixedFont( bool useFixedFont )
{ {
mReaderWin->setUseFixedFont( useFixedFont ); mReaderWin->setUseFixedFont( useFixedFont );
...@@ -198,7 +198,7 @@ Akonadi::Collection KMReaderMainWin::parentCollection() const ...@@ -198,7 +198,7 @@ Akonadi::Collection KMReaderMainWin::parentCollection() const
return mMsg.parentCollection(); return mMsg.parentCollection();
} }
//-----------------------------------------------------------------------------
void KMReaderMainWin::slotTrashMsg() void KMReaderMainWin::slotTrashMsg()
{ {
if ( !mMsg.isValid() ) if ( !mMsg.isValid() )
...@@ -208,7 +208,7 @@ void KMReaderMainWin::slotTrashMsg() ...@@ -208,7 +208,7 @@ void KMReaderMainWin::slotTrashMsg()
close(); close();
} }
//-----------------------------------------------------------------------------
void KMReaderMainWin::slotForwardInlineMsg() void KMReaderMainWin::slotForwardInlineMsg()
{ {
if ( !mReaderWin->message().hasPayload<KMime::Message::Ptr>() ) return; if ( !mReaderWin->message().hasPayload<KMime::Message::Ptr>() ) return;
...@@ -229,7 +229,7 @@ void KMReaderMainWin::slotForwardInlineMsg() ...@@ -229,7 +229,7 @@ void KMReaderMainWin::slotForwardInlineMsg()
command->start(); command->start();
} }
//-----------------------------------------------------------------------------
void KMReaderMainWin::slotForwardAttachedMsg() void KMReaderMainWin::slotForwardAttachedMsg()
{ {
if ( !mReaderWin->message().hasPayload<KMime::Message::Ptr>() ) return; if ( !mReaderWin->message().hasPayload<KMime::Message::Ptr>() ) return;
...@@ -251,7 +251,7 @@ void KMReaderMainWin::slotForwardAttachedMsg() ...@@ -251,7 +251,7 @@ void KMReaderMainWin::slotForwardAttachedMsg()
command->start(); command->start();
} }
//-----------------------------------------------------------------------------
void KMReaderMainWin::slotRedirectMsg() void KMReaderMainWin::slotRedirectMsg()
{ {
if ( !mReaderWin->message().hasPayload<KMime::Message::Ptr>() ) return; if ( !mReaderWin->message().hasPayload<KMime::Message::Ptr>() ) return;
...@@ -261,7 +261,7 @@ void KMReaderMainWin::slotRedirectMsg() ...@@ -261,7 +261,7 @@ void KMReaderMainWin::slotRedirectMsg()
command->start(); command->start();
} }
//-----------------------------------------------------------------------------
void KMReaderMainWin::slotCustomReplyToMsg( const QString &tmpl ) void KMReaderMainWin::slotCustomReplyToMsg( const QString &tmpl )
{ {
if ( !mReaderWin->message().hasPayload<KMime::Message::Ptr>() ) return; if ( !mReaderWin->message().hasPayload<KMime::Message::Ptr>() ) return;
...@@ -275,7 +275,7 @@ void KMReaderMainWin::slotCustomReplyToMsg( const QString &tmpl ) ...@@ -275,7 +275,7 @@ void KMReaderMainWin::slotCustomReplyToMsg( const QString &tmpl )
command->start(); command->start();
} }
//-----------------------------------------------------------------------------
void KMReaderMainWin::slotCustomReplyAllToMsg( const QString &tmpl ) void KMReaderMainWin::slotCustomReplyAllToMsg( const QString &tmpl )
{ {
if ( !mReaderWin->message().hasPayload<KMime::Message::Ptr>() ) return; if ( !mReaderWin->message().hasPayload<KMime::Message::Ptr>() ) return;
...@@ -290,7 +290,7 @@ void KMReaderMainWin::slotCustomReplyAllToMsg( const QString &tmpl ) ...@@ -290,7 +290,7 @@ void KMReaderMainWin::slotCustomReplyAllToMsg( const QString &tmpl )
command->start(); command->start();
} }
//-----------------------------------------------------------------------------
void KMReaderMainWin::slotCustomForwardMsg( const QString &tmpl) void KMReaderMainWin::slotCustomForwardMsg( const QString &tmpl)
{ {
if ( !mReaderWin->message().hasPayload<KMime::Message::Ptr>() ) return; if ( !mReaderWin->message().hasPayload<KMime::Message::Ptr>() ) return;
...@@ -303,7 +303,7 @@ void KMReaderMainWin::slotCustomForwardMsg( const QString &tmpl) ...@@ -303,7 +303,7 @@ void KMReaderMainWin::slotCustomForwardMsg( const QString &tmpl)
command->start(); command->start();
} }
//-----------------------------------------------------------------------------
void KMReaderMainWin::slotConfigChanged() void KMReaderMainWin::slotConfigChanged()
{ {
//readConfig(); //readConfig();
...@@ -363,7 +363,7 @@ void KMReaderMainWin::setupAccel() ...@@ -363,7 +363,7 @@ void KMReaderMainWin::setupAccel()
connect( mReaderWin->viewer(), SIGNAL(moveMessageToTrash()), this, SLOT(slotTrashMsg()) ); connect( mReaderWin->viewer(), SIGNAL(moveMessageToTrash()), this, SLOT(slotTrashMsg()) );
} }
//-----------------------------------------------------------------------------
KAction *KMReaderMainWin::copyActionMenu(QMenu *menu) KAction *KMReaderMainWin::copyActionMenu(QMenu *menu)
{ {
KMMainWidget* mainwin = kmkernel->getKMMainWidget(); KMMainWidget* mainwin = kmkernel->getKMMainWidget();
......
...@@ -97,7 +97,7 @@ using MessageComposer::MessageFactory; ...@@ -97,7 +97,7 @@ using MessageComposer::MessageFactory;
using namespace KMail; using namespace KMail;
using namespace MailCommon; using namespace MailCommon;
//-----------------------------------------------------------------------------
KMReaderWin::KMReaderWin(QWidget *aParent, KMReaderWin::KMReaderWin(QWidget *aParent,
QWidget *mainWindow, QWidget *mainWindow,
KActionCollection* actionCollection, KActionCollection* actionCollection,
...@@ -263,13 +263,13 @@ bool KMReaderWin::isFixedFont() const ...@@ -263,13 +263,13 @@ bool KMReaderWin::isFixedFont() const
return mViewer->isFixedFont(); return mViewer->isFixedFont();
} }
//-----------------------------------------------------------------------------
KMReaderWin::~KMReaderWin() KMReaderWin::~KMReaderWin()
{ {
} }
//-----------------------------------------------------------------------------
void KMReaderWin::readConfig(void) void KMReaderWin::readConfig(void)
{ {
mViewer->readConfig(); mViewer->readConfig();
...@@ -283,13 +283,13 @@ void KMReaderWin::setHeaderStyleAndStrategy( HeaderStyle * style, ...@@ -283,13 +283,13 @@ void KMReaderWin::setHeaderStyleAndStrategy( HeaderStyle * style,
HeaderStrategy * strategy ) { HeaderStrategy * strategy ) {
mViewer->setHeaderStyleAndStrategy( style, strategy ); mViewer->setHeaderStyleAndStrategy( style, strategy );
} }
//-----------------------------------------------------------------------------
void KMReaderWin::setOverrideEncoding( const QString & encoding ) void KMReaderWin::setOverrideEncoding( const QString & encoding )
{ {
mViewer->setOverrideEncoding( encoding ); mViewer->setOverrideEncoding( encoding );
} }
//-----------------------------------------------------------------------------
void KMReaderWin::clearCache() void KMReaderWin::clearCache()
{ {
clear(); clear();
...@@ -319,7 +319,7 @@ static const int numKMailNewFeatures = ...@@ -319,7 +319,7 @@ static const int numKMailNewFeatures =
sizeof kmailNewFeatures / sizeof *kmailNewFeatures; sizeof kmailNewFeatures / sizeof *kmailNewFeatures;
//-----------------------------------------------------------------------------
//static //static
QString KMReaderWin::newFeaturesMD5() QString KMReaderWin::newFeaturesMD5()
{ {
...@@ -332,7 +332,7 @@ QString KMReaderWin::newFeaturesMD5() ...@@ -332,7 +332,7 @@ QString KMReaderWin::newFeaturesMD5()
return QLatin1String(md5.base64Digest()); return QLatin1String(md5.base64Digest());
} }
//-----------------------------------------------------------------------------
void KMReaderWin::displaySplashPage( const QString &info ) void KMReaderWin::displaySplashPage( const QString &info )
{ {
mViewer->displaySplashPage( info ); mViewer->displaySplashPage( info );
...@@ -365,7 +365,7 @@ void KMReaderWin::displayResourceOfflinePage() ...@@ -365,7 +365,7 @@ void KMReaderWin::displayResourceOfflinePage()
} }
//-----------------------------------------------------------------------------
void KMReaderWin::displayAboutPage() void KMReaderWin::displayAboutPage()
{ {
KLocalizedString info = KLocalizedString info =
...@@ -431,12 +431,12 @@ void KMReaderWin::displayAboutPage() ...@@ -431,12 +431,12 @@ void KMReaderWin::displayAboutPage()
displaySplashPage( info.toString() ); displaySplashPage( info.toString() );
} }
//-----------------------------------------------------------------------------
void KMReaderWin::slotFind() void KMReaderWin::slotFind()
{ {
mViewer->slotFind(); mViewer->slotFind();
} }
//-----------------------------------------------------------------------------
void KMReaderWin::slotCopySelectedText() void KMReaderWin::slotCopySelectedText()
{ {
QString selection = mViewer->selectedText(); QString selection = mViewer->selectedText();
...@@ -444,19 +444,19 @@ void KMReaderWin::slotCopySelectedText() ...@@ -444,19 +444,19 @@ void KMReaderWin::slotCopySelectedText()
QApplication::clipboard()->setText( selection ); QApplication::clipboard()->setText( selection );
} }
//-----------------------------------------------------------------------------
void KMReaderWin::setMsgPart( KMime::Content* aMsgPart ) void KMReaderWin::setMsgPart( KMime::Content* aMsgPart )
{ {
mViewer->setMessagePart( aMsgPart ); mViewer->setMessagePart( aMsgPart );
} }
//-----------------------------------------------------------------------------
QString KMReaderWin::copyText() const QString KMReaderWin::copyText() const
{ {
return mViewer->selectedText(); return mViewer->selectedText();
} }
//-----------------------------------------------------------------------------
MessageViewer::Viewer::DisplayFormatMessage KMReaderWin::displayFormatMessageOverwrite() const MessageViewer::Viewer::DisplayFormatMessage KMReaderWin::displayFormatMessageOverwrite() const
{ {
return mViewer->displayFormatMessageOverwrite(); return mViewer->displayFormatMessageOverwrite();
...@@ -468,38 +468,38 @@ void KMReaderWin::setDisplayFormatMessageOverwrite(MessageViewer::Viewer::Displa ...@@ -468,38 +468,38 @@ void KMReaderWin::setDisplayFormatMessageOverwrite(MessageViewer::Viewer::Displa
} }
//-----------------------------------------------------------------------------
void KMReaderWin::setHtmlLoadExtOverride( bool override ) void KMReaderWin::setHtmlLoadExtOverride( bool override )
{ {
mViewer->setHtmlLoadExtOverride( override ); mViewer->setHtmlLoadExtOverride( override );
} }
//-----------------------------------------------------------------------------
bool KMReaderWin::htmlMail() const bool KMReaderWin::htmlMail() const
{ {
return mViewer->htmlMail(); return mViewer->htmlMail();
} }
//-----------------------------------------------------------------------------
bool KMReaderWin::htmlLoadExternal() bool KMReaderWin::htmlLoadExternal()
{ {
return mViewer->htmlLoadExternal(); return mViewer->htmlLoadExternal();
} }
//-----------------------------------------------------------------------------
Akonadi::Item KMReaderWin::message() const Akonadi::Item KMReaderWin::message() const
{ {
return mViewer->messageItem(); return mViewer->messageItem();
} }
//-----------------------------------------------------------------------------
void KMReaderWin::slotMailtoCompose() void KMReaderWin::slotMailtoCompose()
{ {
KMCommand *command = new KMMailtoComposeCommand( urlClicked(), message() ); KMCommand *command = new KMMailtoComposeCommand( urlClicked(), message() );
command->start(); command->start();
} }
//-----------------------------------------------------------------------------
void KMReaderWin::slotMailtoForward() void KMReaderWin::slotMailtoForward()
{ {
KMCommand *command = new KMMailtoForwardCommand( mMainWindow, urlClicked(), KMCommand *command = new KMMailtoForwardCommand( mMainWindow, urlClicked(),
...@@ -507,7 +507,7 @@ void KMReaderWin::slotMailtoForward() ...@@ -507,7 +507,7 @@ void KMReaderWin::slotMailtoForward()
command->start(); command->start();
} }
//-----------------------------------------------------------------------------
void KMReaderWin::slotMailtoAddAddrBook() void KMReaderWin::slotMailtoAddAddrBook()
{ {
const KUrl url = urlClicked(); const KUrl url = urlClicked();
...@@ -536,7 +536,7 @@ void KMReaderWin::slotMailToAddToExistingContact() ...@@ -536,7 +536,7 @@ void KMReaderWin::slotMailToAddToExistingContact()
delete dlg; delete dlg;
} }
//-----------------------------------------------------------------------------
void KMReaderWin::slotMailtoOpenAddrBook() void KMReaderWin::slotMailtoOpenAddrBook()
{ {
const KUrl url = urlClicked(); const KUrl url = urlClicked();
...@@ -548,7 +548,7 @@ void KMReaderWin::slotMailtoOpenAddrBook() ...@@ -548,7 +548,7 @@ void KMReaderWin::slotMailtoOpenAddrBook()
job->start(); job->start();
} }
//-----------------------------------------------------------------------------
void KMReaderWin::slotAddBookmarks() void KMReaderWin::slotAddBookmarks()
{ {
const KUrl url = urlClicked(); const KUrl url = urlClicked();
...@@ -558,7 +558,7 @@ void KMReaderWin::slotAddBookmarks() ...@@ -558,7 +558,7 @@ void KMReaderWin::slotAddBookmarks()
command->start(); command->start();
} }
//-----------------------------------------------------------------------------
void KMReaderWin::slotUrlSave() void KMReaderWin::slotUrlSave()
{ {
const KUrl url = urlClicked(); const KUrl url = urlClicked();
...@@ -577,7 +577,7 @@ void KMReaderWin::slotSaveImageOnDisk() ...@@ -577,7 +577,7 @@ void KMReaderWin::slotSaveImageOnDisk()
command->start(); command->start();
} }
//-----------------------------------------------------------------------------
void KMReaderWin::slotMailtoReply() void KMReaderWin::slotMailtoReply()
{ {
KMCommand *command = new KMMailtoReplyCommand( mMainWindow, urlClicked(), KMCommand *command = new KMMailtoReplyCommand( mMainWindow, urlClicked(),
...@@ -900,7 +900,7 @@ KAction *KMReaderWin::openBlockableItems() const ...@@ -900,7 +900,7 @@ KAction *KMReaderWin::openBlockableItems() const
return mViewer->openBlockableItems(); return mViewer->openBlockableItems();
} }
//-----------------------------------------------------------------------------
void KMReaderWin::slotShareImage() void KMReaderWin::slotShareImage()
{ {
KMCommand *command = new KMShareImageCommand( imageUrlClicked(), this); KMCommand *command = new KMShareImageCommand( imageUrlClicked(), this);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment