summaryrefslogtreecommitdiffstats
path: root/klinkstatus/src/utils
diff options
context:
space:
mode:
Diffstat (limited to 'klinkstatus/src/utils')
-rw-r--r--klinkstatus/src/utils/xsl.cpp50
1 files changed, 25 insertions, 25 deletions
diff --git a/klinkstatus/src/utils/xsl.cpp b/klinkstatus/src/utils/xsl.cpp
index 4a04834b..31db321e 100644
--- a/klinkstatus/src/utils/xsl.cpp
+++ b/klinkstatus/src/utils/xsl.cpp
@@ -35,7 +35,7 @@
#include <tqregexp.h>
#include <tqsignal.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
#include <tqthread.h>
#include <tqevent.h>
#include <tqmutex.h>
@@ -141,7 +141,7 @@ TQString KopeteXSLThread::xsltTransform( const TQString &xmlString, xsltStyleshe
{
if ( styleSheet )
{
- static TQCString appPath( TQString::tqfromLatin1("\"%1\"").tqarg( KApplication::kApplication()->dirs()->findDirs("appdata", TQString::tqfromLatin1("styles/data") ).front() ).utf8() );
+ static TQCString appPath( TQString::fromLatin1("\"%1\"").arg( KApplication::kApplication()->dirs()->findDirs("appdata", TQString::fromLatin1("styles/data") ).front() ).utf8() );
static const char* params[3] = {
"appdata",
@@ -179,7 +179,7 @@ TQString KopeteXSLThread::xsltTransform( const TQString &xmlString, xsltStyleshe
if ( resultString.isEmpty() )
{
- resultString = i18n( "<div><b>KLinkStatus encountered the following error while parsing a message:</b><br />%1</div>" ).tqarg( errorMsg );
+ resultString = i18n( "<div><b>KLinkStatus encountered the following error while parsing a message:</b><br />%1</div>" ).arg( errorMsg );
}
#ifdef RAWXSL
@@ -235,7 +235,7 @@ void XSLT::setXSLT( const TQString &_document )
// Actually, since we need to parse into a libxml2 document anyway, this whole
// nonsense could be replaced with some simple XPath expressions - JK
//
- TQRegExp elementMatch( TQString::tqfromLatin1( "<kopete-i18n>(.*)</kopete-i18n>" ) );
+ TQRegExp elementMatch( TQString::fromLatin1( "<kopete-i18n>(.*)</kopete-i18n>" ) );
elementMatch.setMinimal( true );
TQString document = _document;
int pos;
@@ -261,21 +261,21 @@ void XSLT::setXSLT( const TQString &_document )
{
prependPercent = false;
- if ( *it == TQString::tqfromLatin1( "TIME" ) )
+ if ( *it == TQString::fromLatin1( "TIME" ) )
{
- trans += TQString::tqfromLatin1( "<xsl:value-of select=\"@time\"/>" );
+ trans += TQString::fromLatin1( "<xsl:value-of select=\"@time\"/>" );
}
- else if ( *it == TQString::tqfromLatin1( "TIMESTAMP" ) )
+ else if ( *it == TQString::fromLatin1( "TIMESTAMP" ) )
{
- trans += TQString::tqfromLatin1( "<xsl:value-of select=\"@timestamp\"/>" );
+ trans += TQString::fromLatin1( "<xsl:value-of select=\"@timestamp\"/>" );
}
- else if ( *it == TQString::tqfromLatin1( "FORMATTEDTIMESTAMP" ) )
+ else if ( *it == TQString::fromLatin1( "FORMATTEDTIMESTAMP" ) )
{
- trans += TQString::tqfromLatin1( "<xsl:value-of select=\"@formattedTimestamp\"/>" );
+ trans += TQString::fromLatin1( "<xsl:value-of select=\"@formattedTimestamp\"/>" );
}
- else if ( *it == TQString::tqfromLatin1( "FROM_CONTACT_DISPLAYNAME" ) )
+ else if ( *it == TQString::fromLatin1( "FROM_CONTACT_DISPLAYNAME" ) )
{
- trans += TQString::tqfromLatin1( "<span><xsl:attribute name=\"title\">"
+ trans += TQString::fromLatin1( "<span><xsl:attribute name=\"title\">"
"<xsl:choose>"
"<xsl:when test='from/contact/@contactId=from/contact/contactDisplayName/@text'>"
"<xsl:value-of disable-output-escaping=\"yes\" select=\"from/contact/metaContactDisplayName/@text\"/>"
@@ -290,9 +290,9 @@ void XSLT::setXSLT( const TQString &_document )
"</xsl:attribute>"
"<xsl:value-of disable-output-escaping=\"yes\" select=\"from/contact/contactDisplayName/@text\"/></span>" );
}
- else if ( *it == TQString::tqfromLatin1( "TO_CONTACT_DISPLAYNAME" ) )
+ else if ( *it == TQString::fromLatin1( "TO_CONTACT_DISPLAYNAME" ) )
{
- trans += TQString::tqfromLatin1( "<span><xsl:attribute name=\"title\">"
+ trans += TQString::fromLatin1( "<span><xsl:attribute name=\"title\">"
"<xsl:choose>"
"<xsl:when test='to/contact/@contactId=from/contact/contactDisplayName/@text'>"
"<xsl:value-of disable-output-escaping=\"yes\" select=\"to/contact/metaContactDisplayName/@text\"/>"
@@ -307,37 +307,37 @@ void XSLT::setXSLT( const TQString &_document )
"</xsl:attribute>"
"<xsl:value-of disable-output-escaping=\"yes\" select=\"to/contact/contactDisplayName/@text\"/></span>" );
}
- else if ( *it == TQString::tqfromLatin1( "FROM_METACONTACT_DISPLAYNAME" ) )
+ else if ( *it == TQString::fromLatin1( "FROM_METACONTACT_DISPLAYNAME" ) )
{
- trans += TQString::tqfromLatin1( "<span>"
+ trans += TQString::fromLatin1( "<span>"
"<xsl:attribute name=\"dir\">"
"<xsl:value-of select=\"from/contact/metaContactDisplayName/@dir\"/>"
"</xsl:attribute>"
"<xsl:value-of disable-output-escaping=\"yes\" select=\"from/contact/metaContactDisplayName/@text\"/></span>" );
}
- else if ( *it == TQString::tqfromLatin1( "TO_METACONTACT_DISPLAYNAME" ) )
+ else if ( *it == TQString::fromLatin1( "TO_METACONTACT_DISPLAYNAME" ) )
{
- trans += TQString::tqfromLatin1( "<span>"
+ trans += TQString::fromLatin1( "<span>"
"<xsl:attribute name=\"dir\">"
"<xsl:value-of select=\"to/contact/metaContactDisplayName/@dir\"/>"
"</xsl:attribute>"
"<xsl:value-of disable-output-escaping=\"yes\" select=\"to/contact/metaContactDisplayName/@text\"/></span>" );
}
- else if ( *it == TQString::tqfromLatin1( "FROM_CONTACT_ID" ) )
+ else if ( *it == TQString::fromLatin1( "FROM_CONTACT_ID" ) )
{
- trans += TQString::tqfromLatin1( "<span><xsl:attribute name=\"title\">"
+ trans += TQString::fromLatin1( "<span><xsl:attribute name=\"title\">"
"<xsl:value-of disable-output-escaping=\"yes\" select=\"from/contact/contactDisplayName/@text\"/></xsl:attribute>"
"<xsl:value-of disable-output-escaping=\"yes\" select=\"from/contact/@contactId\"/></span>" );
}
- else if ( *it == TQString::tqfromLatin1( "TO_CONTACT_ID" ) )
+ else if ( *it == TQString::fromLatin1( "TO_CONTACT_ID" ) )
{
- trans += TQString::tqfromLatin1( "<span><xsl:attribute name=\"title\">"
+ trans += TQString::fromLatin1( "<span><xsl:attribute name=\"title\">"
"<xsl:value-of disable-output-escaping=\"yes\" select=\"to/contact/contactDisplayName/@text\"/></xsl:attribute>"
"<xsl:value-of disable-output-escaping=\"yes\" select=\"to/contact/@contactId\"/></span>" );
}
- else if ( *it == TQString::tqfromLatin1( "BODY" ) )
+ else if ( *it == TQString::fromLatin1( "BODY" ) )
{
- trans += TQString::tqfromLatin1( "<xsl:value-of disable-output-escaping=\"yes\" select=\"body\"/>" );
+ trans += TQString::fromLatin1( "<xsl:value-of disable-output-escaping=\"yes\" select=\"body\"/>" );
}
else
{
@@ -387,7 +387,7 @@ void XSLT::setXSLT( const TQString &_document )
}
if( !flags.isEmpty() )
- setProperty("flags", flags.join( TQString::tqfromLatin1("|") ) );
+ setProperty("flags", flags.join( TQString::fromLatin1("|") ) );
}
else
{