summaryrefslogtreecommitdiffstats
path: root/kword/KWTextDocument.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 /kword/KWTextDocument.cpp
parentfe33d391dd7c9da0f83e779344a17e2e445b70a8 (diff)
downloadkoffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.tar.gz
koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kword/KWTextDocument.cpp')
-rw-r--r--kword/KWTextDocument.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/kword/KWTextDocument.cpp b/kword/KWTextDocument.cpp
index a1b0a57a..29252045 100644
--- a/kword/KWTextDocument.cpp
+++ b/kword/KWTextDocument.cpp
@@ -43,7 +43,7 @@ KWTextDocument::KWTextDocument( KWTextFrameSet * textfs, KoTextFormatCollection
}
KWTextDocument::KWTextDocument( KoTextZoomHandler * zoomHandler )
- : KoTextDocument( zoomHandler, new KoTextFormatCollection( KGlobalSettings::generalFont() /*unused*/, TQColor(), KGlobal::locale()->language(), false), 0L, false ),
+ : KoTextDocument( zoomHandler, new KoTextFormatCollection( TDEGlobalSettings::generalFont() /*unused*/, TQColor(), TDEGlobal::locale()->language(), false), 0L, false ),
m_textfs( 0 )
{
init();