[tor-commits] [vidalia/alpha] Torrc inherits QObject

[chiiph at torproject.org]

commit 553ba78cec725b3c8e6e14030383954f6656b615
Author: Feroze Naina <ferozenaina at gmail.com>
Date:   Tue May 29 22:33:52 2012 +0530

    Torrc inherits QObject
---
 src/vidalia/CMakeLists.txt         |    1 +
 src/vidalia/config/torrc/Torrc.cpp |    2 +-
 src/vidalia/config/torrc/Torrc.h   |    4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/vidalia/CMakeLists.txt b/src/vidalia/CMakeLists.txt
index 0ccbdad..41e5aa8 100644
--- a/src/vidalia/CMakeLists.txt
+++ b/src/vidalia/CMakeLists.txt
@@ -149,6 +149,7 @@ qt4_wrap_cpp(vidalia_SRCS
   config/TorSettings.h
   config/VidaliaSettings.h
   config/VSettings.h
+  config/torrc/Torrc.h
 )
 if (USE_MINIUPNPC)
   include_directories(${MINIUPNPC_INCLUDE_DIR})
diff --git a/src/vidalia/config/torrc/Torrc.cpp b/src/vidalia/config/torrc/Torrc.cpp
index d1589b9..8e96f89 100644
--- a/src/vidalia/config/torrc/Torrc.cpp
+++ b/src/vidalia/config/torrc/Torrc.cpp
@@ -19,7 +19,7 @@
 #include <QtGlobal>
 
 Torrc::Torrc(const QString &torrcPath, const QString &defaultsPath) :
-  _torrcPath(torrcPath), changed(false)
+  QObject(), _torrcPath(torrcPath), changed(false)
 {
   load(torrcPath, defaultsPath);
 }
diff --git a/src/vidalia/config/torrc/Torrc.h b/src/vidalia/config/torrc/Torrc.h
index 22a7a13..fcdc6a3 100644
--- a/src/vidalia/config/torrc/Torrc.h
+++ b/src/vidalia/config/torrc/Torrc.h
@@ -21,7 +21,9 @@
 #include "TorControl.h"
 #include "TorrcParser.h"
 
-class Torrc {
+class Torrc : public QObject
+{
+  Q_OBJECT
  public:
   /** Constructor */
   Torrc(const QString &torrcPath, const QString &defaultsPath = "");