[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdevelop/plugins/managers/cmake
From:       Andreas Pakulat <apaku () gmx ! de>
Date:       2009-01-30 18:45:01
Message-ID: 1233341101.145952.18233.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 918780 by apaku:

Use KStandardDirs::findExe to find the cmake executable, which works on all platforms.
Makes executeProcess obsolete

 M  +2 -23     cmakebuilddirchooser.cpp  
 M  +0 -1      cmakebuilddirchooser.h  


--- trunk/KDE/kdevelop/plugins/managers/cmake/cmakebuilddirchooser.cpp #918779:918780
@@ -23,6 +23,7 @@
 #include <KDebug>
 #include <KProcess>
 #include <KMessageBox>
+#include <KStandardDirs>
 #include "ui_cmakebuilddirchooser.h"
 
 CMakeBuildDirChooser::CMakeBuildDirChooser(QWidget* parent)
@@ -32,7 +33,7 @@
     m_chooserUi->setupUi( this );
     m_chooserUi->buildFolder->setMode(KFile::Directory|KFile::ExistingOnly);
 
-    QString cmakeBin=executeProcess("which", QStringList("cmake"));
+    QString cmakeBin=KStandardDirs::findExe( "cmake" );
     setCMakeBinary(KUrl(cmakeBin));
     
     connect(m_chooserUi->cmakeBin, SIGNAL(textChanged(const QString &)), this, SLOT(updated()));
@@ -190,27 +191,5 @@
 
 QString CMakeBuildDirChooser::buildType() const { return m_chooserUi->buildType->currentText(); }
 
-QString CMakeBuildDirChooser::executeProcess(const QString& execName, const QStringList& args)
-{
-    kDebug(9042) << "Executing:" << execName << "::" << args /*<< "into" << *m_vars*/;
-
-    KProcess p;
-    p.setOutputChannelMode(KProcess::MergedChannels);
-    p.setProgram(execName, args);
-    p.start();
-
-    if(!p.waitForFinished())
-    {
-        kDebug(9042) << "failed to execute:" << execName;
-    }
-
-    QByteArray b = p.readAllStandardOutput();
-    QString t;
-    t.prepend(b.trimmed());
-    kDebug(9042) << "executed" << execName << "<" << t;
-
-    return t;
-}
-
 #include "cmakebuilddirchooser.moc"
 
--- trunk/KDE/kdevelop/plugins/managers/cmake/cmakebuilddirchooser.h #918779:918780
@@ -68,7 +68,6 @@
     private:
         static QString buildDirProject(const KUrl& buildDir);
 
-        static QString executeProcess(const QString& execName, const QStringList& args=QStringList());
         Ui::CMakeBuildDirChooser* m_chooserUi;
         KUrl m_srcFolder;
 };
[prev in list] [next in list] [prev in thread] [next in thread]