summaryrefslogtreecommitdiffstats
path: root/kmail/objecttreeparser.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:49:30 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:49:30 -0600
commita9bde819f2b421dcc44741156e75eca4bb5fb4f4 (patch)
treed087071b1e8fcf79698938efec19f8e48bab0799 /kmail/objecttreeparser.cpp
parent5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff)
downloadtdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz
tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kmail/objecttreeparser.cpp')
-rw-r--r--kmail/objecttreeparser.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp
index 0b974a53..fe0592d5 100644
--- a/kmail/objecttreeparser.cpp
+++ b/kmail/objecttreeparser.cpp
@@ -733,7 +733,7 @@ namespace KMail {
void ObjectTreeParser::writeDecryptionInProgressBlock() {
assert( mReader );
// PENDING(marc) find an animated icon here:
- //const TQString iconName = KGlobal::instance()->iconLoader()->iconPath( "decrypted", KIcon::Small );
+ //const TQString iconName = TDEGlobal::instance()->iconLoader()->iconPath( "decrypted", KIcon::Small );
const TQString decryptedData = i18n("Encrypted data not shown");
PartMetaData messagePart;
messagePart.isDecryptable = true;
@@ -749,7 +749,7 @@ void ObjectTreeParser::writeDecryptionInProgressBlock() {
void ObjectTreeParser::writeDeferredDecryptionBlock() {
assert( mReader );
- const TQString iconName = KGlobal::instance()->iconLoader()->iconPath( "decrypted", KIcon::Small );
+ const TQString iconName = TDEGlobal::instance()->iconLoader()->iconPath( "decrypted", KIcon::Small );
const TQString decryptedData =
"<div style=\"font-size:large; text-align:center;padding-top:20pt;\">" +
i18n("This message is encrypted.") +
@@ -2010,7 +2010,7 @@ bool ObjectTreeParser::processApplicationMsTnefSubtype( partNode *node, ProcessR
TQString href = "file:" + KURL::encode_string( dir + TQDir::separator() + att->name() );
KMimeType::Ptr mimeType = KMimeType::mimeType( att->mimeTag() );
- TQString iconName = KGlobal::instance()->iconLoader()->iconPath( mimeType->icon( TQString(), false ), KIcon::Desktop );
+ TQString iconName = TDEGlobal::instance()->iconLoader()->iconPath( mimeType->icon( TQString(), false ), KIcon::Desktop );
htmlWriter()->queue( "<div><a href=\"" + href + "\"><img src=\"" +
iconName + "\" border=\"0\" style=\"max-width: 100%\">" + label +
@@ -2563,7 +2563,7 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block,
.arg( keyWithWithoutURL );
else
htmlStr += i18n( "Message was signed on %1 with key %2." )
- .arg( KGlobal::locale()->formatDateTime( created ),
+ .arg( TDEGlobal::locale()->formatDateTime( created ),
keyWithWithoutURL );
}
else {
@@ -2572,7 +2572,7 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block,
.arg( keyWithWithoutURL );
else
htmlStr += i18n( "Message was signed by %3 on %1 with key %2" )
- .arg( KGlobal::locale()->formatDateTime( created ),
+ .arg( TDEGlobal::locale()->formatDateTime( created ),
keyWithWithoutURL,
signer );
}
@@ -2621,7 +2621,7 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block,
TQDateTime created = block.creationTime;
if ( created.isValid() )
htmlStr += i18n( "Message was signed on %1 with unknown key %2." )
- .arg( KGlobal::locale()->formatDateTime( created ),
+ .arg( TDEGlobal::locale()->formatDateTime( created ),
keyWithWithoutURL );
else
htmlStr += i18n( "Message was signed with unknown key %1." )
@@ -2997,11 +2997,11 @@ TQString ObjectTreeParser::quotedHTML( const TQString& s, bool decorate )
// Cache Icons
if ( mCollapseIcon.isEmpty() ) {
mCollapseIcon= LinkLocator::pngToDataUrl(
- KGlobal::instance()->iconLoader()->iconPath( "quotecollapse",0 ));
+ TDEGlobal::instance()->iconLoader()->iconPath( "quotecollapse",0 ));
}
if ( mExpandIcon.isEmpty() )
mExpandIcon= LinkLocator::pngToDataUrl(
- KGlobal::instance()->iconLoader()->iconPath( "quoteexpand",0 ));
+ TDEGlobal::instance()->iconLoader()->iconPath( "quoteexpand",0 ));
}
for (unsigned int p=0; p<line.length(); p++) {