From 28edc0aa2ab09297288186f5bc15765eb7be58c0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:47:22 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kio/kfile/kdirselectdialog.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'kio/kfile/kdirselectdialog.cpp') diff --git a/kio/kfile/kdirselectdialog.cpp b/kio/kfile/kdirselectdialog.cpp index 4a3613b98..8f8a8b299 100644 --- a/kio/kfile/kdirselectdialog.cpp +++ b/kio/kfile/kdirselectdialog.cpp @@ -133,7 +133,7 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly, if ( localOnly && !d->startURL.isLocalFile() ) { d->startURL = KURL(); - TQString docPath = KGlobalSettings::documentPath(); + TQString docPath = TDEGlobalSettings::documentPath(); if (TQDir(docPath).exists()) d->startURL.setPath( docPath ); else @@ -146,7 +146,7 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly, d->branch = createBranch( root ); - readConfig( KGlobal::config(), "DirSelect Dialog" ); + readConfig( TDEGlobal::config(), "DirSelect Dialog" ); m_mainLayout->addWidget( m_treeView, 1 ); m_mainLayout->addWidget( d->urlCombo, 0 ); @@ -314,7 +314,7 @@ void KDirSelectDialog::accept() KFileDialog::setStartDir( url() ); KDialogBase::accept(); - saveConfig( KGlobal::config(), "DirSelect Dialog" ); + saveConfig( TDEGlobal::config(), "DirSelect Dialog" ); } -- cgit v1.2.1