summaryrefslogtreecommitdiffstats
path: root/kpresenter/KPrWebPresentation.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:23:24 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:23:24 -0600
commit5b8ab149469c8e186ee8b05d90c0103ae722dd85 (patch)
treefb31321c80b12ee8e2237bdcf8c228fe44e67772 /kpresenter/KPrWebPresentation.cpp
parentfe33d391dd7c9da0f83e779344a17e2e445b70a8 (diff)
downloadkoffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.tar.gz
koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kpresenter/KPrWebPresentation.cpp')
-rw-r--r--kpresenter/KPrWebPresentation.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/kpresenter/KPrWebPresentation.cpp b/kpresenter/KPrWebPresentation.cpp
index d4df256b..a8f56470 100644
--- a/kpresenter/KPrWebPresentation.cpp
+++ b/kpresenter/KPrWebPresentation.cpp
@@ -387,7 +387,7 @@ void KPrWebPresentation::writeStartOfHeader(TQTextStream& streamOut, TQTextCodec
void KPrWebPresentation::createSlidesHTML( KProgress *progressBar )
{
- TQTextCodec *codec = KGlobal::charsets()->codecForName( m_encoding );
+ TQTextCodec *codec = TDEGlobal::charsets()->codecForName( m_encoding );
const TQString brtag ( "<br" + TQString(isXML()?" /":"") + ">" );
@@ -511,7 +511,7 @@ void KPrWebPresentation::createSlidesHTML( KProgress *progressBar )
else
htmlAuthor=TQString("<a href=\"mailto:%1\">%2</a>").arg( escapeHtmlText( codec, email )).arg( escapeHtmlText( codec, author ));
streamOut << EscapeEncodingOnly ( codec, i18n( "Created on %1 by <i>%2</i> with <a href=\"http://www.koffice.org/kpresenter\">KPresenter</a>" )
- .arg( KGlobal::locale()->formatDate ( TQDate::currentDate() ) ).arg( htmlAuthor ) );
+ .arg( TDEGlobal::locale()->formatDate ( TQDate::currentDate() ) ).arg( htmlAuthor ) );
streamOut << " </center><hr noshade=\"noshade\"" << ( isXML() ?" /":"") << ">\n";
}
@@ -530,7 +530,7 @@ void KPrWebPresentation::createSlidesHTML( KProgress *progressBar )
void KPrWebPresentation::createMainPage( KProgress *progressBar )
{
- TQTextCodec *codec = KGlobal::charsets()->codecForName( m_encoding );
+ TQTextCodec *codec = TDEGlobal::charsets()->codecForName( m_encoding );
KTempFile tmp;
TQString dest = TQString( "%1/index.html" ).arg( path );
TQFile file( tmp.name() );
@@ -562,7 +562,7 @@ void KPrWebPresentation::createMainPage( KProgress *progressBar )
TQString htmlAuthor = email.isEmpty() ? escapeHtmlText( codec, author ) :
TQString("<a href=\"mailto:%1\">%2</a>").arg( escapeHtmlText( codec, email )).arg( escapeHtmlText( codec, author ));
streamOut << EscapeEncodingOnly ( codec, i18n( "Created on %1 by <i>%2</i> with <a href=\"http://www.koffice.org/kpresenter\">KPresenter</a>" )
- .arg( KGlobal::locale()->formatDate ( TQDate::currentDate() ) ).arg( htmlAuthor ) );
+ .arg( TDEGlobal::locale()->formatDate ( TQDate::currentDate() ) ).arg( htmlAuthor ) );
streamOut << "</body>\n</html>\n";
file.close();
@@ -605,7 +605,7 @@ void KPrWebPresentation::init()
textColor = TQt::black;
titleColor = TQt::red;
- path = KGlobalSettings::documentPath() + "www";
+ path = TDEGlobalSettings::documentPath() + "www";
zoom = 100;
@@ -802,12 +802,12 @@ void KPrWebPresentationWizard::setupPage2()
// Fill encoding combo
// Stolen from tdelibs/kate/part/katedialogs.cpp
- TQStringList encodings(KGlobal::charsets()->descriptiveEncodingNames());
+ TQStringList encodings(TDEGlobal::charsets()->descriptiveEncodingNames());
int idx = 0;
for (uint i = 0; i < encodings.count(); i++)
{
bool found = false;
- TQTextCodec *codecForEnc = KGlobal::charsets()->codecForName(KGlobal::charsets()->encodingForName(encodings[i]), found);
+ TQTextCodec *codecForEnc = TDEGlobal::charsets()->codecForName(TDEGlobal::charsets()->encodingForName(encodings[i]), found);
if (found)
{
encoding->insertItem(encodings[i]);
@@ -1060,7 +1060,7 @@ void KPrWebPresentationWizard::finish()
webPres.setLoopSlides( loopSlides->isChecked() );
webPres.setXML( doctype->currentItem() != 0 );
bool found = false;
- TQTextCodec *codecForEnc = KGlobal::charsets()->codecForName(KGlobal::charsets()->encodingForName(encoding->currentText()), found);
+ TQTextCodec *codecForEnc = TDEGlobal::charsets()->codecForName(TDEGlobal::charsets()->encodingForName(encoding->currentText()), found);
if ( found )
{
webPres.setEncoding( codecForEnc->name() );