commit dfbc8a03d70c19ad0cc8ab31f389ea39cb00ee7d Author: Tomás Touceda <chiiph@torproject.org> Date: Sun Mar 18 15:02:52 2012 -0300 Remove duplicate TorControl method --- src/torcontrol/TorControl.cpp | 7 ------- src/torcontrol/TorControl.h | 2 -- src/vidalia/MainWindow.cpp | 2 +- 3 files changed, 1 insertions(+), 10 deletions(-) diff --git a/src/torcontrol/TorControl.cpp b/src/torcontrol/TorControl.cpp index 1dc523e..fbf602d 100644 --- a/src/torcontrol/TorControl.cpp +++ b/src/torcontrol/TorControl.cpp @@ -134,13 +134,6 @@ TorControl::start(const QString &tor, const QStringList &args) } } -/** Returns true if the process is running */ -bool -TorControl::torStarted() -{ - return _torProcess->state() == QProcess::Running; -} - /** Called when starting the tor process failed */ void TorControl::torStartFailed(QString errmsg) diff --git a/src/torcontrol/TorControl.h b/src/torcontrol/TorControl.h index fabc3d9..3c5f6d7 100644 --- a/src/torcontrol/TorControl.h +++ b/src/torcontrol/TorControl.h @@ -58,8 +58,6 @@ public: /** Start the Tor process */ void start(const QString &tor, const QStringList &args); - /** Returns true if the process is running */ - bool torStarted(); /** Stop the Tor process */ bool stop(QString *errmsg = 0); diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index 0861b0c..3b505ad 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -658,7 +658,7 @@ MainWindow::start() _torControl->start(settings.getExecutable(), args); QString errmsg; - while(not _torControl->torStarted()) { + while(not _torControl->isRunning()) { QCoreApplication::processEvents(); if(not _torControl->shouldContinue(&errmsg) and not _pressedStop) { startFailed(errmsg);