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 /kword/KWDocument.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 'kword/KWDocument.cpp')
| -rw-r--r-- | kword/KWDocument.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kword/KWDocument.cpp b/kword/KWDocument.cpp index d5a82f5d..94651cf8 100644 --- a/kword/KWDocument.cpp +++ b/kword/KWDocument.cpp @@ -213,7 +213,7 @@ KWDocument::KWDocument(TQWidget *parentWidget, const char *widname, TQObject* pa m_bHasEndNotes = false; m_bInsertDirectCursor=false; - m_globalLanguage = KGlobal::locale()->language(); + m_globalLanguage = TDEGlobal::locale()->language(); m_bGlobalHyphenation = false; m_bGeneratingPreview = false; m_viewModeType="ModeNormal"; @@ -366,7 +366,7 @@ void KWDocument::initConfig() m_bShowDocStruct = false; // off by default for embedded docs, but still toggleable m_pgUpDownMovesCaret = config->readBoolEntry( "PgUpDownMovesCaret", true ); m_bInsertDirectCursor= config->readBoolEntry( "InsertDirectCursor", false ); - m_globalLanguage=config->readEntry("language", KGlobal::locale()->language()); + m_globalLanguage=config->readEntry("language", TDEGlobal::locale()->language()); m_bGlobalHyphenation=config->readBoolEntry("hyphenation", false); setShowGrid( config->readBoolEntry( "ShowGrid" , false )); @@ -2068,8 +2068,8 @@ void KWDocument::loadDefaultFrameStyleTemplates() { const TQString fsfileName( locate("data", "kword/framestyles.xml") ); - kdDebug(30003) << "Data directory: " << KGlobal::dirs()->resourceDirs( "data" ) << endl; - kdDebug(30003) << "Directory searched: " << KGlobal::dirs()->resourceDirs( "data" ) << endl; + kdDebug(30003) << "Data directory: " << TDEGlobal::dirs()->resourceDirs( "data" ) << endl; + kdDebug(30003) << "Directory searched: " << TDEGlobal::dirs()->resourceDirs( "data" ) << endl; kdDebug(30003) << "File framestyles.xml searched at: " << fsfileName << endl; m_frameStyleColl->setDefault( true ); |