Changeset 75

Timestamp:

01/12/06 18:52:38 (3 years ago)

Author:

edmanm

Message:

Remove the word "Tor" from three methodss. It should be obvious that
we're talking about Tor since the class is called TorControl?;
Make TorControl? inherit QObject since, for my next trick, I will be exposing
some slotss and signals.

Location:

trunk/src/control

Files:

• torcontrol.cpp (modified) (3 diffs)
• torcontrol.h (modified) (3 diffs)

trunk/src/control/torcontrol.cpp

@@ -40 +40 @@
  * started, otherwise returns false. */
 bool
-TorControl::startTor(QString *errmsg)
+TorControl::start(QString *errmsg)
 {
   VidaliaSettings settings;
@@ -50 +50 @@
 /** Stop the Tor process. */
 void
-TorControl::stopTor()
+TorControl::stop()
 {
   _torProcess.stop();
@@ -57 +57 @@
 /** Detect if the Tor process is running. */
 bool
-TorControl::torIsRunning()
+TorControl::isRunning()
 {
   return (_torProcess.pid() != 0);

trunk/src/control/torcontrol.h

@@ -25 +25 @@
 #define _TORCONTROL_H
 
+#include <QObject>
 #include <QHash>
 
@@ -30 +31 @@
 #include "torprocess.h"
 
-class TorControl
+class TorControl : public QObject
 {
+  Q_OBJECT
+  
 private:
   ControlConnection _controlConn;
   TorProcess _torProcess;
-  
+
 public:
   /** Default constructor */
@@ -44 +47 @@
 
   /** Start the Tor process */
-  bool startTor(QString *errmsg = 0);
+  bool start(QString *errmsg = 0);
 
   /** Stop the Tor process */
-  void stopTor();
+  void stop();
 
   /** Detect if the Tor process is running */
-  bool torIsRunning();
+  bool isRunning();
 
   /** Connect to Tor's control socket */