[vidalia-svn] r1589: process.cpp shouldn't depend on Vidalia. (trunk/src/util)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-01-15 00:57:42 -0500 (Mon, 15 Jan 2007)
New Revision: 1589

Modified:
   trunk/src/util/process.cpp
Log:
process.cpp shouldn't depend on Vidalia.


Modified: trunk/src/util/process.cpp
===================================================================
--- trunk/src/util/process.cpp	2007-01-15 05:38:37 UTC (rev 1588)
+++ trunk/src/util/process.cpp	2007-01-15 05:57:42 UTC (rev 1589)
@@ -1,7 +1,7 @@
 /****************************************************************
  *  Vidalia is distributed under the following license:
  *
- *  Copyright (C) 2006,  Matt Edman, Justin Hipple
+ *  Copyright (C) 2006-2007,  Matt Edman, Justin Hipple
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
@@ -29,7 +29,7 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QTextStream>
-#include <vidalia.h>
+#include <QApplication>
 
 #include "string.h"
 #include "process.h"
@@ -53,10 +53,10 @@
 #if defined(Q_OS_WIN)
   QHash<qint64, QString> procList = win32_process_list();
   if (procList.contains(pid)) {
-    /* A process with this ID exists. Check if it's Vidalia. */
+    /* A process with this ID exists. Check if it's the same as this process. */
     QString exeFile = procList.value(pid);
-    QString vidaliaExe = QFileInfo(Vidalia::applicationFilePath()).fileName();
-    return (exeFile.toLower() == vidaliaExe.toLower());
+    QString thisExe = QFileInfo(QApplication::applicationFilePath()).fileName();
+    return (exeFile.toLower() == thisExe.toLower());
   }
   return false;
 #else