diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:21:55 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:21:55 -0600 |
| commit | d318087925a540a204c9d3820d5a09fbda58b8b2 (patch) | |
| tree | b8dde6aa5d6559b81c6667d8364a4364c27bcba4 /kmail/kmreaderwin.cpp | |
| parent | 6cc5f72b33f1d281de3e1bf809b1b5e77d5c96cf (diff) | |
| download | tdepim-d318087925a540a204c9d3820d5a09fbda58b8b2.tar.gz tdepim-d318087925a540a204c9d3820d5a09fbda58b8b2.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kmail/kmreaderwin.cpp')
| -rw-r--r-- | kmail/kmreaderwin.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp index 31f7356b6..f75137ee7 100644 --- a/kmail/kmreaderwin.cpp +++ b/kmail/kmreaderwin.cpp @@ -93,7 +93,7 @@ using KMail::TeeHtmlWriter; // for the click on attachment stuff (dnaber): #include <kuserprofile.h> #include <kcharsets.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kstandarddirs.h> // Sven's : for access and getpid #include <kcursor.h> #include <kdebug.h> @@ -105,7 +105,7 @@ using KMail::TeeHtmlWriter; #include <ktempfile.h> #include <kprocess.h> #include <kdialog.h> -#include <kaction.h> +#include <tdeaction.h> #include <kiconloader.h> #include <kmdcodec.h> #include <kasciistricmp.h> @@ -440,7 +440,7 @@ KMReaderWin::KMReaderWin(TQWidget *aParent, mSavedRelativePosition( 0 ), mDecrytMessageOverwrite( false ), mShowSignatureDetails( false ), - mShowAttachmentQuicklist( true ), + mShowAttachmentQuictdelist( true ), mShowRawToltecMail( false ) { mExternalWindow = (aParent == mainWindow ); @@ -2872,12 +2872,12 @@ void KMReaderWin::injectAttachments() TQString visibility; TQString urlHandle; TQString imgSrc; - if( !showAttachmentQuicklist() ) { - urlHandle.append( "kmail:showAttachmentQuicklist" ); - imgSrc.append( "attachmentQuicklistClosed.png" ); + if( !showAttachmentQuictdelist() ) { + urlHandle.append( "kmail:showAttachmentQuictdelist" ); + imgSrc.append( "attachmentQuictdelistClosed.png" ); } else { - urlHandle.append( "kmail:hideAttachmentQuicklist" ); - imgSrc.append( "attachmentQuicklistOpened.png" ); + urlHandle.append( "kmail:hideAttachmentQuictdelist" ); + imgSrc.append( "attachmentQuictdelistOpened.png" ); } TQString html = renderAttachments( mRootNode, TQApplication::palette().active().background() ); @@ -2919,7 +2919,7 @@ TQString KMReaderWin::renderAttachments(partNode * node, const TQColor &bgColor if ( !subHtml.isEmpty() ) { TQString visibility; - if ( !showAttachmentQuicklist() ) { + if ( !showAttachmentQuictdelist() ) { visibility.append( "display:none;" ); } |