[vidalia-svn] r1984: Shorten some #includes now that our includepath is a little (in trunk: . src src/gui/bwgraph src/gui/log src/gui/network)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-10-09 23:38:40 -0400 (Tue, 09 Oct 2007)
New Revision: 1984

Modified:
   trunk/
   trunk/src/gui/bwgraph/bwgraph.h
   trunk/src/gui/log/messagelog.h
   trunk/src/gui/network/netviewer.h
   trunk/src/vidalia.h
Log:
 r2016@lysithea:  edmanm | 2007-10-09 23:24:40 -0400
 Shorten some #includes now that our includepath is a little smarter.



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r2016] on dc66be73-d13e-47ba-a267-8dc7cda68c65

Modified: trunk/src/gui/bwgraph/bwgraph.h
===================================================================
--- trunk/src/gui/bwgraph/bwgraph.h	2007-10-10 03:38:31 UTC (rev 1983)
+++ trunk/src/gui/bwgraph/bwgraph.h	2007-10-10 03:38:40 UTC (rev 1984)
@@ -31,9 +31,9 @@
 #include <QDateTime>
 #include <QEvent>
 
-#include <config/vidaliasettings.h>
-#include <control/torcontrol.h>
-#include <gui/common/vidaliawindow.h>
+#include <vidaliasettings.h>
+#include <torcontrol.h>
+#include <vidaliawindow.h>
 
 #include "ui_bwgraph.h"
 

Modified: trunk/src/gui/log/messagelog.h
===================================================================
--- trunk/src/gui/log/messagelog.h	2007-10-10 03:38:31 UTC (rev 1983)
+++ trunk/src/gui/log/messagelog.h	2007-10-10 03:38:40 UTC (rev 1984)
@@ -31,9 +31,9 @@
 #include <QMainWindow>
 #include <QStringList>
 #include <QResizeEvent>
-#include <control/torcontrol.h>
-#include <config/vidaliasettings.h>
-#include <gui/common/vidaliawindow.h>
+#include <torcontrol.h>
+#include <vidaliasettings.h>
+#include <vidaliawindow.h>
 
 #include "logfile.h"
 #include "logtreeitem.h"

Modified: trunk/src/gui/network/netviewer.h
===================================================================
--- trunk/src/gui/network/netviewer.h	2007-10-10 03:38:31 UTC (rev 1983)
+++ trunk/src/gui/network/netviewer.h	2007-10-10 03:38:40 UTC (rev 1984)
@@ -33,9 +33,9 @@
 #include <QEvent>
 #include <QTimer>
 #include <QHash>
-#include <control/torcontrol.h>
+#include <torcontrol.h>
 #include <util/geoip/geoipresolver.h>
-#include <gui/common/vidaliawindow.h>
+#include <vidaliawindow.h>
 
 #include "tormapwidget.h"
 #include "ui_netviewer.h"

Modified: trunk/src/vidalia.h
===================================================================
--- trunk/src/vidalia.h	2007-10-10 03:38:31 UTC (rev 1983)
+++ trunk/src/vidalia.h	2007-10-10 03:38:40 UTC (rev 1984)
@@ -38,9 +38,9 @@
 #include <QString>
 
 #include <util/log.h>
-#include <gui/help/browser/helpbrowser.h>
-#include <config/vidaliasettings.h>
-#include <control/torcontrol.h>
+#include <helpbrowser.h>
+#include <vidaliasettings.h>
+#include <torcontrol.h>
 
 /** Vidalia's version string */
 #define VIDALIA_VERSION    "0.0.15-svn"