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/kmcommands.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/kmcommands.cpp')
-rw-r--r-- | kmail/kmcommands.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp index 0b029cdcc..34c994009 100644 --- a/kmail/kmcommands.cpp +++ b/kmail/kmcommands.cpp @@ -1238,14 +1238,14 @@ KMCommand::Result KMForwardInlineCommand::execute() if (msgList.count() >= 2) { // Multiple forward uint id = 0; - TQPtrList<KMMessage> linklist; + TQPtrList<KMMessage> lintdelist; for ( KMMessage *msg = msgList.first(); msg; msg = msgList.next() ) { // set the identity if (id == 0) id = msg->headerField( "X-KMail-Identity" ).stripWhiteSpace().toUInt(); // msgText += msg->createForwardBody(); - linklist.append( msg ); + lintdelist.append( msg ); } if ( id == 0 ) id = mIdentity; // use folder identity if no message had an id set @@ -1255,7 +1255,7 @@ KMCommand::Result KMForwardInlineCommand::execute() fwdMsg->setCharset( "utf-8" ); // fwdMsg->setBody( msgText ); - for ( KMMessage *msg = linklist.first(); msg; msg = linklist.next() ) { + for ( KMMessage *msg = lintdelist.first(); msg; msg = lintdelist.next() ) { TemplateParser parser( fwdMsg, TemplateParser::Forward ); parser.setSelection( msg->body() ); // FIXME: Why is this needed? parser.process( msg, 0, true ); @@ -1541,14 +1541,14 @@ KMCommand::Result KMCustomForwardCommand::execute() if (msgList.count() >= 2) { // Multiple forward uint id = 0; - TQPtrList<KMMessage> linklist; + TQPtrList<KMMessage> lintdelist; for ( KMMessage *msg = msgList.first(); msg; msg = msgList.next() ) { // set the identity if (id == 0) id = msg->headerField( "X-KMail-Identity" ).stripWhiteSpace().toUInt(); // msgText += msg->createForwardBody(); - linklist.append( msg ); + lintdelist.append( msg ); } if ( id == 0 ) id = mIdentity; // use folder identity if no message had an id set @@ -1558,7 +1558,7 @@ KMCommand::Result KMCustomForwardCommand::execute() fwdMsg->setCharset( "utf-8" ); // fwdMsg->setBody( msgText ); - for ( KMMessage *msg = linklist.first(); msg; msg = linklist.next() ) { + for ( KMMessage *msg = lintdelist.first(); msg; msg = lintdelist.next() ) { TemplateParser parser( fwdMsg, TemplateParser::Forward ); parser.setSelection( msg->body() ); // FIXME: Why is this needed? parser.process( msg, 0, true ); |