[GNUnet-SVN] r3123 - in gnunet-qt/src: common include plugins/general

[durner]

Author: durner
Date: 2006-07-17 12:33:09 -0700 (Mon, 17 Jul 2006)
New Revision: 3123

Modified:
   gnunet-qt/src/common/gstring.cc
   gnunet-qt/src/include/gnunet_qt_common.h
   gnunet-qt/src/plugins/general/checkDaemonThread.cc
   gnunet-qt/src/plugins/general/checkDaemonThread.h
Log:
fixes

Modified: gnunet-qt/src/common/gstring.cc
===================================================================
--- gnunet-qt/src/common/gstring.cc     2006-07-16 17:04:30 UTC (rev 3122)
+++ gnunet-qt/src/common/gstring.cc     2006-07-17 19:33:09 UTC (rev 3123)
@@ -45,19 +45,25 @@
     ::free(cstr);
 }
 
-GString &GString::operator=(GString &src)
+GString &GString::operator=(const QString &src)
 {
-  ((QString) (*this)) = (QString) src;
+  if (cstr)
+    ::free(cstr);
+
+  QString::operator=(src);
   return *this;
 }
 
-GString &GString::operator=(QString &src)
+GString &GString::operator=(const GString &src)
 {
+  if (cstr)
+    ::free(cstr);
+
   QString::operator=(src);
   return *this;
 }
 
-GString &GString::operator=(QString src)
+GString &GString::operator=(const char *src)
 {
   QString::operator=(src);
   return *this;

Modified: gnunet-qt/src/include/gnunet_qt_common.h
===================================================================
--- gnunet-qt/src/include/gnunet_qt_common.h    2006-07-16 17:04:30 UTC (rev 
3122)
+++ gnunet-qt/src/include/gnunet_qt_common.h    2006-07-17 19:33:09 UTC (rev 
3123)
@@ -76,9 +76,9 @@
   GString(const char *str);
   GString(QString &src);
   ~GString();
-  GString &operator=(GString &src);
-  GString &operator=(QString src);
-  GString &operator=(QString &src);
+  GString &operator=(const QString &src);
+  GString &operator=(const GString &src);
+  GString &operator=(const char *src);
 
   /**
    * @brief Capitalize every word in this string

Modified: gnunet-qt/src/plugins/general/checkDaemonThread.cc
===================================================================
--- gnunet-qt/src/plugins/general/checkDaemonThread.cc  2006-07-16 17:04:30 UTC 
(rev 3122)
+++ gnunet-qt/src/plugins/general/checkDaemonThread.cc  2006-07-17 19:33:09 UTC 
(rev 3123)
@@ -32,14 +32,20 @@
 #include "checkDaemonThread.h"
 
 
-GGNUnetAppDesc &GGNUnetAppDesc::operator=(GGNUnetAppDesc src)
-{
+GGNUnetAppDesc &GGNUnetAppDesc::operator=(const GGNUnetAppDesc &src)
+{ 
   strApp = src.strApp;
   strDesc = src.strDesc;
   
   return *this;
 }
 
+GGNUnetAppDesc::GGNUnetAppDesc(const GGNUnetAppDesc &src)
+{
+  strApp = src.strApp;
+  strDesc = src.strDesc;
+}
+
 GCheckDaemonThread::GCheckDaemonThread(QObject *parent) : QThread(parent)
 {
   checkAppsIn = 1;

Modified: gnunet-qt/src/plugins/general/checkDaemonThread.h
===================================================================
--- gnunet-qt/src/plugins/general/checkDaemonThread.h   2006-07-16 17:04:30 UTC 
(rev 3122)
+++ gnunet-qt/src/plugins/general/checkDaemonThread.h   2006-07-17 19:33:09 UTC 
(rev 3123)
@@ -38,9 +38,10 @@
 {
 public:
   GGNUnetAppDesc(){};
-  GGNUnetAppDesc &operator=(GGNUnetAppDesc src);
+  GGNUnetAppDesc(const GGNUnetAppDesc &src);
+  GGNUnetAppDesc &operator=(const GGNUnetAppDesc &src);
   virtual ~GGNUnetAppDesc(){};
-
+  
   GString strApp, strDesc;
 };