summaryrefslogtreecommitdiffstats
path: root/kpresenter/KPrConfig.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/KPrConfig.cpp
parentfe33d391dd7c9da0f83e779344a17e2e445b70a8 (diff)
downloadkoffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.tar.gz
koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kpresenter/KPrConfig.cpp')
-rw-r--r--kpresenter/KPrConfig.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kpresenter/KPrConfig.cpp b/kpresenter/KPrConfig.cpp
index 48afca3a..731759d9 100644
--- a/kpresenter/KPrConfig.cpp
+++ b/kpresenter/KPrConfig.cpp
@@ -792,7 +792,7 @@ void KPrConfigureDefaultDocPage::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 );
}
@@ -994,7 +994,7 @@ void KPrConfigurePathPage::slotDefault()
{
TQListViewItem * item = m_pPathView->findItem(i18n("Picture Path"), 0);
if ( item )
- item->setText(1, KGlobalSettings::documentPath());
+ item->setText(1, TDEGlobalSettings::documentPath());
item = m_pPathView->findItem(i18n("Backup Path"), 0);
if ( item )
item->setText(1, TQString() );