diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:23:24 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:23:24 -0600 |
| commit | 5b8ab149469c8e186ee8b05d90c0103ae722dd85 (patch) | |
| tree | fb31321c80b12ee8e2237bdcf8c228fe44e67772 /lib/kotext/KoTextFormat.cpp | |
| parent | fe33d391dd7c9da0f83e779344a17e2e445b70a8 (diff) | |
| download | koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.tar.gz koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'lib/kotext/KoTextFormat.cpp')
| -rw-r--r-- | lib/kotext/KoTextFormat.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/kotext/KoTextFormat.cpp b/lib/kotext/KoTextFormat.cpp index 2554d4ee..0f3d48d2 100644 --- a/lib/kotext/KoTextFormat.cpp +++ b/lib/kotext/KoTextFormat.cpp @@ -67,7 +67,7 @@ KoTextFormat::KoTextFormat() m_strikeOutType = S_NONE; m_underlineStyle = U_SOLID; m_strikeOutStyle = S_SOLID; - m_language = KGlobal::locale()->language(); + m_language = TDEGlobal::locale()->language(); d->m_bHyphenation = false; d->m_underLineWidth = 1.0; d->m_shadowDistanceX = 0; @@ -1678,7 +1678,7 @@ KoTextFormatCollection::KoTextFormatCollection() #ifdef DEBUG_COLLECTION kdDebug(32500) << "KoTextFormatCollection::KoTextFormatCollection " << this << endl; #endif - defFormat = new KoTextFormat( TQApplication::font(), TQColor(), KGlobal::locale()->language(), false ); + defFormat = new KoTextFormat( TQApplication::font(), TQColor(), TDEGlobal::locale()->language(), false ); lastFormat = cres = 0; cflags = -1; cKey.setAutoDelete( TRUE ); |