Commit 4f745901 authored by Christian Ehrlicher's avatar Christian Ehrlicher
Browse files

k3process--

svn path=/trunk/KDE/kdebase/apps/; revision=676657
parent 14d35fbd
......@@ -24,7 +24,7 @@
#include <kio/jobuidelegate.h>
#include <kcmdlineargs.h>
#include <klocale.h>
#include <k3process.h>
#include <kprocess.h>
#include <kstandarddirs.h>
#include <kmessagebox.h>
#include <kmimetypetrader.h>
......@@ -380,14 +380,14 @@ bool ClientApp::createNewWindow(const KUrl & url, bool newTab, bool tempFile, co
id.initId( startup_id_str );
id.setupStartupEnv();
#endif
K3Process proc;
proc << "kshell" << "konqueror";
QStringList args;
args << QLatin1String("konqueror");
if ( !mimetype.isEmpty() )
proc << "-mimetype" << mimetype;
args << "-mimetype" << mimetype;
if ( tempFile )
proc << "-tempfile";
proc << url.url();
proc.start( K3Process::DontCare );
args << "-tempfile";
args << url.url();
KProcess::startDetached(QLatin1String("kshell"), args);
#ifdef Q_WS_X11
KStartupInfo::resetStartupEnv();
#endif
......
......@@ -111,7 +111,7 @@
#include <kicon.h>
#include <kiconloader.h>
#include <kmenu.h>
#include <k3process.h>
#include <kprocess.h>
#include <kio/scheduler.h>
#include <kio/netaccess.h>
#include <kacceleratormanager.h>
......@@ -133,7 +133,6 @@
#endif
#include <kauthorized.h>
#include <ktoolinvocation.h>
#include <kstaticdeleter.h>
#include "konq_mainwindow_p.h"
#include <QtDBus/QtDBus>
#include <kconfiggroup.h>
......@@ -1394,17 +1393,16 @@ void KonqMainWindow::slotOpenTerminal()
}
}
K3Process cmd;
cmd.setWorkingDirectory(dir);
// Compensate for terminal having arguments.
QStringList args = term.split(' ', QString::SkipEmptyParts);
for ( QStringList::iterator it = args.begin(); it != args.end(); ++it )
cmd << *it;
if(args.count() == 0)
return;
QString prog = args.takeFirst();
KProcess::startDetached(prog, args, dir, NULL);
kDebug(1202) << "slotOpenTerminal: directory " << dir
<< ", terminal:" << term << endl;
cmd.start(K3Process::DontCare);
}
void KonqMainWindow::slotOpenLocation()
......
add_subdirectory( ebrowsing )
add_subdirectory( konq )
add_subdirectory( konqhtml )
# k3process
if(NOT WIN32)
add_subdirectory( konqhtml )
endif(NOT WIN32)
add_subdirectory( performance )
add_subdirectory( kio )
add_subdirectory( filetypes )
......
......@@ -31,7 +31,7 @@
#include <QtGui/QRadioButton>
// KDE
#include <k3process.h>
#include <kprocess.h>
#include <kdebug.h>
#include <kgenericfactory.h>
#include <kio/http_slave_defaults.h>
......@@ -130,11 +130,8 @@ void KCacheConfigDialog::configChanged()
void KCacheConfigDialog::slotClearCache()
{
K3Process process;
process << "kio_http_cache_cleaner" << "--clear-all";
process.start(K3Process::DontCare);
// Cleaning up might take a while. Better detach.
process.detach();
KProcess::startDetached(QLatin1String("kio_http_cache_cleaner"),
QStringList(QLatin1String("--clear-all")));
}
#include "cache.moc"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment