[vidalia-svn] r2145: Missed a few... (in trunk: . src src/config src/control src/geoip src/util)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-11-30 21:24:17 -0500 (Fri, 30 Nov 2007)
New Revision: 2145

Removed:
   trunk/src/util/string.cpp
   trunk/src/util/string.h
Modified:
   trunk/
   trunk/src/config/serversettings.cpp
   trunk/src/control/controlconnection.cpp
   trunk/src/control/controlsocket.cpp
   trunk/src/control/torcontrol.cpp
   trunk/src/control/torprocess.cpp
   trunk/src/geoip/geoipcache.cpp
   trunk/src/main.cpp
   trunk/src/util/file.cpp
   trunk/src/util/file.h
   trunk/src/util/process.cpp
Log:
 r2171@lysithea:  edmanm | 2007-11-30 21:24:08 -0500
 Missed a few...



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r2171] on 0108964c-5b0b-4c9e-969f-e2288315d100

Modified: trunk/src/config/serversettings.cpp
===================================================================
--- trunk/src/config/serversettings.cpp	2007-12-01 01:48:30 UTC (rev 2144)
+++ trunk/src/config/serversettings.cpp	2007-12-01 02:24:17 UTC (rev 2145)
@@ -26,8 +26,8 @@
  */
 
 #include <QHostInfo>
-#include <util/net.h>
-#include <util/string.h>
+#include <net.h>
+#include <stringutil.h>
 
 #include "serversettings.h"
 #include "torsettings.h"

Modified: trunk/src/control/controlconnection.cpp
===================================================================
--- trunk/src/control/controlconnection.cpp	2007-12-01 01:48:30 UTC (rev 2144)
+++ trunk/src/control/controlconnection.cpp	2007-12-01 02:24:17 UTC (rev 2145)
@@ -27,7 +27,7 @@
  */
 
 #include <QMutexLocker>
-#include <util/string.h>
+#include <stringutil.h>
 #include <vidalia.h>
 
 #include "controlconnection.h"

Modified: trunk/src/control/controlsocket.cpp
===================================================================
--- trunk/src/control/controlsocket.cpp	2007-12-01 01:48:30 UTC (rev 2144)
+++ trunk/src/control/controlsocket.cpp	2007-12-01 02:24:17 UTC (rev 2145)
@@ -25,7 +25,7 @@
  * \brief Socket used to connect to Tor's control interface
  */
 
-#include <util/string.h>
+#include <stringutil.h>
 #include <vidalia.h>
 
 #include "controlsocket.h"

Modified: trunk/src/control/torcontrol.cpp
===================================================================
--- trunk/src/control/torcontrol.cpp	2007-12-01 01:48:30 UTC (rev 2144)
+++ trunk/src/control/torcontrol.cpp	2007-12-01 02:24:17 UTC (rev 2145)
@@ -26,7 +26,8 @@
  */
 
 #include <QHostAddress>
-#include <util/file.h>
+#include <file.h>
+#include <stringutil.h>
 #include "torcontrol.h"
 
 

Modified: trunk/src/control/torprocess.cpp
===================================================================
--- trunk/src/control/torprocess.cpp	2007-12-01 01:48:30 UTC (rev 2144)
+++ trunk/src/control/torprocess.cpp	2007-12-01 02:24:17 UTC (rev 2145)
@@ -27,7 +27,7 @@
 
 #include <QString>
 #include <vidalia.h>
-#include <util/string.h>
+#include <stringutil.h>
 
 /* Needed for _PROCESS_INFORMATION so that pid() works on Win32 */
 #if defined (Q_OS_WIN32)

Modified: trunk/src/geoip/geoipcache.cpp
===================================================================
--- trunk/src/geoip/geoipcache.cpp	2007-12-01 01:48:30 UTC (rev 2144)
+++ trunk/src/geoip/geoipcache.cpp	2007-12-01 02:24:17 UTC (rev 2145)
@@ -28,8 +28,8 @@
 #include <QFile>
 #include <QDir>
 #include <QTextStream>
-#include <util/string.h>
-#include <util/file.h>
+#include <stringutil.h>
+#include <file.h>
 #include <vidalia.h>
 
 #include "geoipcache.h"

Modified: trunk/src/main.cpp
===================================================================
--- trunk/src/main.cpp	2007-12-01 01:48:30 UTC (rev 2144)
+++ trunk/src/main.cpp	2007-12-01 02:24:17 UTC (rev 2145)
@@ -28,9 +28,9 @@
 #include <QObject>
 #include <vidalia.h>
 #include <gui/mainwindow.h>
-#include <gui/common/vmessagebox.h>
-#include <util/process.h>
-#include <util/string.h>
+#include <vmessagebox.h>
+#include <process.h>
+#include <stringutil.h>
 
 #if defined(Q_OS_WIN32)
 #include <QSysInfo>

Modified: trunk/src/util/file.cpp
===================================================================
--- trunk/src/util/file.cpp	2007-12-01 01:48:30 UTC (rev 2144)
+++ trunk/src/util/file.cpp	2007-12-01 02:24:17 UTC (rev 2145)
@@ -27,6 +27,7 @@
 
 #include <QDir>
 #include <QFile>
+#include "stringutil.h"
 #include "file.h"
 
 #if defined(Q_OS_WIN32)

Modified: trunk/src/util/file.h
===================================================================
--- trunk/src/util/file.h	2007-12-01 01:48:30 UTC (rev 2144)
+++ trunk/src/util/file.h	2007-12-01 02:24:17 UTC (rev 2145)
@@ -29,7 +29,6 @@
 #define _FILE_H
 
 #include <QString>
-#include "string.h"
 
 
 /**  Create an empty file named <b>filename</b>. if <b>createdir</b> is true,

Modified: trunk/src/util/process.cpp
===================================================================
--- trunk/src/util/process.cpp	2007-12-01 01:48:30 UTC (rev 2144)
+++ trunk/src/util/process.cpp	2007-12-01 02:24:17 UTC (rev 2145)
@@ -31,7 +31,7 @@
 #include <QTextStream>
 #include <QApplication>
 
-#include "string.h"
+#include "stringutil.h"
 #include "process.h"
 
 

Deleted: trunk/src/util/string.cpp

Deleted: trunk/src/util/string.h