[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase/runtime/kioslave
From: Wouter Becq <terwou () payperbyte ! be>
Date: 2008-11-18 15:28:31
Message-ID: 1227022111.589284.689.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 886100 by terwou:
port K3Process->KProcess
M +1 -1 finger/CMakeLists.txt
M +8 -33 finger/kio_finger.cpp
M +0 -8 finger/kio_finger.h
M +1 -1 man/CMakeLists.txt
M +13 -26 man/kio_man.cpp
M +1 -7 man/kio_man.h
M +1 -1 man/tests/CMakeLists.txt
--- trunk/KDE/kdebase/runtime/kioslave/finger/CMakeLists.txt #886099:886100
@@ -10,7 +10,7 @@
kde4_add_plugin(kio_finger ${kio_finger_PART_SRCS})
-target_link_libraries(kio_finger ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KIO_LIBS} )
+target_link_libraries(kio_finger ${KDE4_KIO_LIBS} )
install(TARGETS kio_finger DESTINATION ${PLUGIN_INSTALL_DIR} )
--- trunk/KDE/kdebase/runtime/kioslave/finger/kio_finger.cpp #886099:886100
@@ -25,7 +25,6 @@
#include <QByteArray>
#include <QTextStream>
-#include <Qt3Support/Q3Dict>
#include <QFile>
#include <QRegExp>
@@ -35,6 +34,7 @@
#include <kstandarddirs.h>
#include <klocale.h>
#include <kurl.h>
+#include <KProcess>
using namespace KIO;
@@ -70,7 +70,6 @@
FingerProtocol::FingerProtocol(const QByteArray &pool_socket, const QByteArray &app_socket)
: QObject(), SlaveBase("finger", pool_socket, app_socket)
{
- myStdStream = new QString();
getProgramPath();
}
@@ -86,7 +85,6 @@
delete myFingerPath;
delete myFingerPerlScript;
delete myFingerCSSFile;
- delete myStdStream;
}
@@ -101,9 +99,6 @@
//kDebug() << "myURL: " << myURL->prettyUrl();
- // Reset the stream
- *myStdStream="";
-
QString query = myURL->query();
QString refreshRate = defaultRefreshRate;
@@ -121,42 +116,22 @@
//kDebug() << "Refresh rate: " << refreshRate;
- myKProcess = new K3Process();
- *myKProcess << *myPerlPath << *myFingerPerlScript
- << *myFingerPath << *myFingerCSSFile
- << refreshRate << myURL->host() << myURL->user() ;
+ KProcess proc;
+ proc << *myPerlPath << *myFingerPerlScript
+ << *myFingerPath << *myFingerCSSFile
+ << refreshRate << myURL->host() << myURL->user();
- connect(myKProcess, SIGNAL(receivedStdout(K3Process *, char *, int)),
- this, SLOT(slotGetStdOutput(K3Process *, char *, int)));
- //connect(myKProcess, SIGNAL(receivedStderr(K3Process *, char *, int)),
- // this, SLOT(slotGetStdOutput(K3Process *, char *, int)));
-
- myKProcess->start(K3Process::Block, K3Process::All);
-
- data(QByteArray(myStdStream->toLocal8Bit()));
-
+ proc.setOutputChannelMode(KProcess::MergedChannels);
+ proc.execute();
+ data(proc.readAllStandardOutput());
data(QByteArray());
finished();
-
- //clean up
-
- delete myKProcess;
}
/* ---------------------------------------------------------------------------------- */
-void FingerProtocol::slotGetStdOutput(K3Process* /* p */, char *s, int len)
-{
- //kDebug() << "void FingerProtocol::slotGetStdoutOutput()";
- *myStdStream += QString::fromLocal8Bit(s, len);
-}
-
-
-/* ---------------------------------------------------------------------------------- */
-
-
void FingerProtocol::mimetype(const KUrl & /*url*/)
{
mimeType("text/html");
--- trunk/KDE/kdebase/runtime/kioslave/finger/kio_finger.h #886099:886100
@@ -23,7 +23,6 @@
#include <kurl.h>
-#include <k3process.h>
#include <kio/global.h>
#include <kio/slavebase.h>
@@ -39,9 +38,6 @@
virtual void mimetype(const KUrl& url);
virtual void get(const KUrl& url);
-private Q_SLOTS:
- void slotGetStdOutput(K3Process*, char*, int);
-
private:
KUrl *myURL;
@@ -50,11 +46,7 @@
QString *myFingerPerlScript;
QString *myFingerCSSFile;
- QString *myStdStream;
-
- K3Process *myKProcess;
-
void getProgramPath();
void parseCommandLine(const KUrl& url);
};
--- trunk/KDE/kdebase/runtime/kioslave/man/CMakeLists.txt #886099:886100
@@ -8,7 +8,7 @@
kde4_add_plugin(kio_man ${kio_man_PART_SRCS})
-target_link_libraries(kio_man ${KDE4_KDE3SUPPORT_LIBS} )
+target_link_libraries(kio_man ${KDE4_KIO_LIBS} )
install(TARGETS kio_man DESTINATION ${PLUGIN_INSTALL_DIR} )
--- trunk/KDE/kdebase/runtime/kioslave/man/kio_man.cpp #886099:886100
@@ -30,7 +30,6 @@
#include <QFile>
#include <QTextStream>
#include <QDataStream>
-#include <Qt3Support/Q3PtrList>
#include <QMap>
#include <QRegExp>
#include <QTextCodec>
@@ -39,7 +38,7 @@
#include <kcomponentdata.h>
#include <kglobal.h>
#include <kstandarddirs.h>
-#include <k3process.h>
+#include <KProcess>
#include <klocale.h>
#include <kmimetype.h>
@@ -210,13 +209,11 @@
break;
}
if ( it_name == names.constEnd() ) {
- K3Process proc;
+ KProcess proc;
proc << "whatis" << "-M" << (*it_dir) << "-w" << "*";
- myStdStream.clear();
- connect( &proc, SIGNAL( receivedStdout(K3Process *, char *, int ) ),
- SLOT( slotGetStdOutput( K3Process *, char *, int ) ) );
- proc.start( K3Process::Block, K3Process::Stdout );
- QTextStream t( &myStdStream, QIODevice::ReadOnly );
+ proc.setOutputChannelMode( KProcess::OnlyStdoutChannel );
+ proc.execute();
+ QTextStream t( proc.readAllStandardOutput(), QIODevice::ReadOnly );
parseWhatIs( i, t, mark );
}
}
@@ -541,11 +538,6 @@
finished();
}
-void MANProtocol::slotGetStdOutput(K3Process* /* p */, char *s, int len)
-{
- myStdStream += QString::fromLocal8Bit(s, len);
-}
-
char *MANProtocol::readManPage(const char *_filename)
{
QByteArray filename = _filename;
@@ -560,18 +552,13 @@
//QString file_mimetype = KMimeType::findByPath(QString(filename), 0, false)->name();
if (QString(filename).contains("sman", Qt::CaseInsensitive)) //file_mimetype == "text/html" || )
{
- myStdStream =QString();
- K3Process proc;
-
- /* Determine path to sgml2roff, if not already done. */
- getProgramPath();
- proc << mySgml2RoffPath << filename;
-
- connect(&proc, SIGNAL(receivedStdout (K3Process *, char *, int)),
- this, SLOT(slotGetStdOutput(K3Process *, char *, int)));
- proc.start(K3Process::Block, K3Process::All);
-
- const QByteArray cstr=myStdStream.toLatin1();
+ KProcess proc;
+ // Determine path to sgml2roff, if not already done.
+ getProgramPath();
+ proc << mySgml2RoffPath << filename;
+ proc.setOutputChannelMode( KProcess::OnlyStdoutChannel );
+ proc.execute();
+ const QByteArray cstr = proc.readAllStandardOutput();
const int len = cstr.size()-1;
buf = new char[len + 4];
memmove(buf + 1, cstr.data(), len);
@@ -709,7 +696,7 @@
KComponentData componentData("kio_man");
- kDebug(7107) << "STARTING " << getpid();
+ kDebug(7107) << "STARTING";
if (argc != 4)
{
--- trunk/KDE/kdebase/runtime/kioslave/man/kio_man.h #886099:886100
@@ -28,8 +28,6 @@
#include <kio/global.h>
#include <kio/slavebase.h>
-class K3Process;
-
class MANProtocol : public QObject, public KIO::SlaveBase
{
Q_OBJECT
@@ -56,10 +54,7 @@
char *readManPage(const char *filename);
static MANProtocol *self();
-
-private Q_SLOTS:
- void slotGetStdOutput(K3Process*, char*, int);
-
+
private:
void checkManPaths();
QStringList manDirectories();
@@ -83,7 +78,6 @@
QStringList m_mandbpath; ///< Path of catman directories
QStringList section_names;
- QString myStdStream;
QString mySgml2RoffPath;
void getProgramPath();
--- trunk/KDE/kdebase/runtime/kioslave/man/tests/CMakeLists.txt #886099:886100
@@ -13,7 +13,7 @@
kde4_add_executable(kio_man_test TEST ${kio_man_test_SRCS})
set_target_properties(kio_man_test PROPERTIES COMPILE_FLAGS "-DSIMPLE_MAN2HTML -DKIO_MAN_TEST")
-target_link_libraries(kio_man_test ${KDE4_KDE3SUPPORT_LIBS} ${QT_QT3SUPPORT_LIBRARY})
+target_link_libraries(kio_man_test ${KDE4_KDECORE_LIBS})
########### next target ###############
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic