diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /libkonq/konq_operations.cc | |
parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'libkonq/konq_operations.cc')
-rw-r--r-- | libkonq/konq_operations.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libkonq/konq_operations.cc b/libkonq/konq_operations.cc index afed003dc..1f81c1027 100644 --- a/libkonq/konq_operations.cc +++ b/libkonq/konq_operations.cc @@ -77,7 +77,7 @@ KonqOperations::~KonqOperations() void KonqOperations::editMimeType( const TQString & mimeType ) { TQString keditfiletype = TQString::fromLatin1("keditfiletype"); - KRun::runCommand( keditfiletype + " " + KProcess::quote(mimeType), + KRun::runCommand( keditfiletype + " " + TDEProcess::quote(mimeType), keditfiletype, keditfiletype /*unused*/); } @@ -474,7 +474,7 @@ void KonqOperations::asyncDrop( const KFileItem * destItem ) // (If this fails, there is a bug in KFileItem::acceptsDrops) kdDebug(1203) << "KonqOperations::doDrop " << m_destURL.path() << "should be an executable" << endl; Q_ASSERT ( access( TQFile::encodeName(m_destURL.path()), X_OK ) == 0 ); - KProcess proc; + TDEProcess proc; proc << m_destURL.path() ; // Launch executable for each of the files KURL::List lst = m_info->lst; @@ -482,7 +482,7 @@ void KonqOperations::asyncDrop( const KFileItem * destItem ) for ( ; it != lst.end() ; it++ ) proc << (*it).path(); // assume local files kdDebug(1203) << "starting " << m_destURL.path() << " with " << lst.count() << " arguments" << endl; - proc.start( KProcess::DontCare ); + proc.start( TDEProcess::DontCare ); } delete this; } @@ -503,7 +503,7 @@ void KonqOperations::doFileCopy() mlst.append(*it); if ( local && KDesktopFile::isDesktopFile((*it).path())) isDesktopFile = true; - if ( local && (*it).path().startsWith(KGlobalSettings::desktopPath())) + if ( local && (*it).path().startsWith(TDEGlobalSettings::desktopPath())) itemIsOnDesktop = true; if ( local || (*it).protocol() != "trash" ) allItemsAreFromTrash = false; @@ -511,7 +511,7 @@ void KonqOperations::doFileCopy() bool linkOnly = false; if (isDesktopFile && !kapp->authorize("run_desktop_files") && - (m_destURL.path(1) == KGlobalSettings::desktopPath()) ) + (m_destURL.path(1) == TDEGlobalSettings::desktopPath()) ) { linkOnly = true; } @@ -638,10 +638,10 @@ void KonqOperations::rename( TQWidget * parent, const KURL & oldurl, const KURL& op->setOperation( job, MOVE, lst, newurl ); (void) new KonqCommandRecorder( KonqCommand::MOVE, lst, newurl, job ); // if moving the desktop then update config file and emit - if ( oldurl.isLocalFile() && oldurl.path(1) == KGlobalSettings::desktopPath() ) + if ( oldurl.isLocalFile() && oldurl.path(1) == TDEGlobalSettings::desktopPath() ) { kdDebug(1203) << "That rename was the Desktop path, updating config files" << endl; - KConfig *globalConfig = KGlobal::config(); + KConfig *globalConfig = TDEGlobal::config(); KConfigGroupSaver cgs( globalConfig, "Paths" ); globalConfig->writePathEntry("Desktop" , newurl.path(), true, true ); globalConfig->sync(); |