From 5b8ab149469c8e186ee8b05d90c0103ae722dd85 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:23:24 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kword/KWConfig.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kword/KWConfig.cpp') diff --git a/kword/KWConfig.cpp b/kword/KWConfig.cpp index 4fda082d..5959d39d 100644 --- a/kword/KWConfig.cpp +++ b/kword/KWConfig.cpp @@ -74,7 +74,7 @@ using namespace KSpell2; // little helper stolen from kmail // (Note: KDialogBase should have version of the methods that take a TQString for the icon name) static inline TQPixmap loadIcon( const char * name ) { - return KGlobal::instance()->iconLoader() + return TDEGlobal::instance()->iconLoader() ->loadIcon( TQString::fromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium ); } @@ -911,7 +911,7 @@ void ConfigureDefaultDocPage::slotDefault() m_tabStopWidth->setValue( MM_TO_POINT(15) ); m_createBackupFile->setChecked( true ); // m_directInsertCursor->setChecked( false ); - m_globalLanguage->setCurrentText( KoGlobal::languageFromTag( KGlobal::locale()->language() ) ); + m_globalLanguage->setCurrentText( KoGlobal::languageFromTag( TDEGlobal::locale()->language() ) ); m_autoHyphenation->setChecked( false ); } -- cgit v1.2.1