From f1a2430393d58e92ab67a54904b1e93c3ad06f4d Mon Sep 17 00:00:00 2001
From: Niels <niels.kummerfeldt@tu-harburg.de>
Date: Wed, 17 Nov 2010 22:05:12 +0100
Subject: [PATCH] Revert "first try to fix building with OpenWRT toolchain that
 does not include QtCore and QtGui in the include path"

This reverts commit da88ec21cdbda458d04368292008126c3ebe5715.

This was not the right solution
---
 monav/contractionhierarchies/binaryheap.h              |  2 +-
 monav/contractionhierarchies/blockcache.h              |  6 +++---
 monav/contractionhierarchies/compressedgraph.h         |  4 ++--
 .../contractionhierarchiesclient.cpp                   |  4 ++--
 .../contractionhierarchiesclient.h                     |  4 ++--
 monav/gpsgrid/gpsgridclient.cpp                        |  8 ++++----
 monav/gpsgrid/gpsgridclient.h                          |  6 +++---
 monav/gpsgrid/table.h                                  |  8 ++++----
 monav/interfaces/iaddresslookup.h                      |  4 ++--
 monav/interfaces/igpslookup.h                          |  4 ++--
 monav/interfaces/irouter.h                             |  4 ++--
 monav/unicodetournamenttrie/trie.h                     |  2 +-
 .../unicodetournamenttrieclient.cpp                    |  4 ++--
 .../unicodetournamenttrieclient.h                      |  6 +++---
 monav/utils/edgeconnector.h                            |  2 +-
 monav/utils/qthelpers.h                                | 10 +++++-----
 16 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/monav/contractionhierarchies/binaryheap.h b/monav/contractionhierarchies/binaryheap.h
index a7bbbb2..571d3ce 100644
--- a/monav/contractionhierarchies/binaryheap.h
+++ b/monav/contractionhierarchies/binaryheap.h
@@ -24,7 +24,7 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <cassert>
 #include <vector>
-#include <QtCore/QHash>
+#include <QHash>
 
 template< typename NodeID, typename Key >
 class ArrayStorage {
diff --git a/monav/contractionhierarchies/blockcache.h b/monav/contractionhierarchies/blockcache.h
index fc8f306..2b94fc9 100644
--- a/monav/contractionhierarchies/blockcache.h
+++ b/monav/contractionhierarchies/blockcache.h
@@ -20,10 +20,10 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef BLOCKCACHE_H_INCLUDED
 #define BLOCKCACHE_H_INCLUDED
 
-#include <QtCore/QFile>
-#include <QtCore/QHash>
+#include <QFile>
+#include <QHash>
 #include <limits>
-#include <QtCore/QtDebug>
+#include <QtDebug>
 
 // Block must have member function / variables:
 // variable id => block id
diff --git a/monav/contractionhierarchies/compressedgraph.h b/monav/contractionhierarchies/compressedgraph.h
index 04d57f9..404acf9 100644
--- a/monav/contractionhierarchies/compressedgraph.h
+++ b/monav/contractionhierarchies/compressedgraph.h
@@ -24,8 +24,8 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 #include "utils/coordinates.h"
 #include "utils/bithelpers.h"
 #include "blockcache.h"
-#include <QtCore/QString>
-#include <QtCore/QFile>
+#include <QString>
+#include <QFile>
 #include <algorithm>
 #include <vector>
 
diff --git a/monav/contractionhierarchies/contractionhierarchiesclient.cpp b/monav/contractionhierarchies/contractionhierarchiesclient.cpp
index a4e6262..1ea16da 100644
--- a/monav/contractionhierarchies/contractionhierarchiesclient.cpp
+++ b/monav/contractionhierarchies/contractionhierarchiesclient.cpp
@@ -22,10 +22,10 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "contractionhierarchiesclient.h"
 #include "utils/qthelpers.h"
-#include <QtCore/QtDebug>
+#include <QtDebug>
 #include <stack>
 #ifndef NOGUI
-	#include <QtGui/QMessageBox>
+	#include <QMessageBox>
 #endif
 
 ContractionHierarchiesClient::ContractionHierarchiesClient()
diff --git a/monav/contractionhierarchies/contractionhierarchiesclient.h b/monav/contractionhierarchies/contractionhierarchiesclient.h
index 998c962..d2c3ff1 100644
--- a/monav/contractionhierarchies/contractionhierarchiesclient.h
+++ b/monav/contractionhierarchies/contractionhierarchiesclient.h
@@ -20,8 +20,8 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef CONTRACTIONHIERARCHIESCLIENT_H
 #define CONTRACTIONHIERARCHIESCLIENT_H
 
-#include <QtCore/QObject>
-#include <QtCore/QStringList>
+#include <QObject>
+#include <QStringList>
 #include "interfaces/irouter.h"
 #include "binaryheap.h"
 #include "compressedgraph.h"
diff --git a/monav/gpsgrid/gpsgridclient.cpp b/monav/gpsgrid/gpsgridclient.cpp
index ad99d9a..fcbc02c 100644
--- a/monav/gpsgrid/gpsgridclient.cpp
+++ b/monav/gpsgrid/gpsgridclient.cpp
@@ -18,14 +18,14 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "gpsgridclient.h"
-#include <QtCore/QtDebug>
-#include <QtCore/QHash>
+#include <QtDebug>
+#include <QHash>
 #include <algorithm>
 #include "utils/qthelpers.h"
 #ifndef NOGUI
-	#include <QtGui/QInputDialog>
+	#include <QInputDialog>
 #endif
-#include <QtCore/QSettings>
+#include <QSettings>
 
 GPSGridClient::GPSGridClient()
 {
diff --git a/monav/gpsgrid/gpsgridclient.h b/monav/gpsgrid/gpsgridclient.h
index 7b5afa1..0f80cc0 100644
--- a/monav/gpsgrid/gpsgridclient.h
+++ b/monav/gpsgrid/gpsgridclient.h
@@ -20,12 +20,12 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef GPSGRIDCLIENT_H
 #define GPSGRIDCLIENT_H
 
-#include <QtCore/QObject>
-#include <QtCore/QFile>
+#include <QObject>
+#include <QFile>
 #include "interfaces/igpslookup.h"
 #include "cell.h"
 #include "table.h"
-#include <QtCore/QCache>
+#include <QCache>
 
 class GPSGridClient : public QObject, public IGPSLookup
 {
diff --git a/monav/gpsgrid/table.h b/monav/gpsgrid/table.h
index 0d0f5a1..7850264 100644
--- a/monav/gpsgrid/table.h
+++ b/monav/gpsgrid/table.h
@@ -20,12 +20,12 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef TABLE_H
 #define TABLE_H
 
-#include <QtCore/QtGlobal>
-#include <QtCore/QCache>
-#include <QtCore/QFile>
+#include <QtGlobal>
+#include <QCache>
+#include <QFile>
 #include <string.h>
 #include <vector>
-#include <QtCore/QtDebug>
+#include <QtDebug>
 
 namespace gg {
 
diff --git a/monav/interfaces/iaddresslookup.h b/monav/interfaces/iaddresslookup.h
index 45643cc..f2c3b91 100644
--- a/monav/interfaces/iaddresslookup.h
+++ b/monav/interfaces/iaddresslookup.h
@@ -21,8 +21,8 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 #define IADDRESSLOOKUP_H
 
 #include "utils/coordinates.h"
-#include <QtCore/QtPlugin>
-#include <QtCore/QVector>
+#include <QtPlugin>
+#include <QVector>
 
 class IAddressLookup
 {
diff --git a/monav/interfaces/igpslookup.h b/monav/interfaces/igpslookup.h
index 036a850..ad30761 100644
--- a/monav/interfaces/igpslookup.h
+++ b/monav/interfaces/igpslookup.h
@@ -22,8 +22,8 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "utils/config.h"
 #include "utils/coordinates.h"
-#include <QtCore/QtPlugin>
-#include <QtCore/QVector>
+#include <QtPlugin>
+#include <QVector>
 
 class IGPSLookup
 {
diff --git a/monav/interfaces/irouter.h b/monav/interfaces/irouter.h
index 9e6631a..ba266a3 100644
--- a/monav/interfaces/irouter.h
+++ b/monav/interfaces/irouter.h
@@ -23,8 +23,8 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 #include "utils/config.h"
 #include "utils/coordinates.h"
 #include "interfaces/igpslookup.h"
-#include <QtCore/QtPlugin>
-#include <QtCore/QVector>
+#include <QtPlugin>
+#include <QVector>
 
 class IRouter
 {
diff --git a/monav/unicodetournamenttrie/trie.h b/monav/unicodetournamenttrie/trie.h
index 76be0f8..d3567f7 100644
--- a/monav/unicodetournamenttrie/trie.h
+++ b/monav/unicodetournamenttrie/trie.h
@@ -20,7 +20,7 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef TRIE_H
 #define TRIE_H
 
-#include <QtCore/QString>
+#include <QString>
 #include <vector>
 #include "utils/coordinates.h"
 #include "utils/bithelpers.h"
diff --git a/monav/unicodetournamenttrie/unicodetournamenttrieclient.cpp b/monav/unicodetournamenttrie/unicodetournamenttrieclient.cpp
index 0fe842a..9a5822a 100644
--- a/monav/unicodetournamenttrie/unicodetournamenttrieclient.cpp
+++ b/monav/unicodetournamenttrie/unicodetournamenttrieclient.cpp
@@ -23,10 +23,10 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "unicodetournamenttrieclient.h"
 #include "utils/qthelpers.h"
-#include <QtCore/QtDebug>
+#include <QtDebug>
 #include <algorithm>
 #ifndef NOGUI
- #include <QtGui/QMessageBox>
+ #include <QMessageBox>
 #endif
 
 UnicodeTournamentTrieClient::UnicodeTournamentTrieClient()
diff --git a/monav/unicodetournamenttrie/unicodetournamenttrieclient.h b/monav/unicodetournamenttrie/unicodetournamenttrieclient.h
index e6fccf8..e597044 100644
--- a/monav/unicodetournamenttrie/unicodetournamenttrieclient.h
+++ b/monav/unicodetournamenttrie/unicodetournamenttrieclient.h
@@ -20,9 +20,9 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef UNICODETOURNAMENTTRIECLIENT_H
 #define UNICODETOURNAMENTTRIECLIENT_H
 
-#include <QtCore/QObject>
-#include <QtCore/QtPlugin>
-#include <QtCore/QFile>
+#include <QObject>
+#include <QtPlugin>
+#include <QFile>
 #include "interfaces/iaddresslookup.h"
 #include "trie.h"
 
diff --git a/monav/utils/edgeconnector.h b/monav/utils/edgeconnector.h
index 33f91f0..61aa4f2 100644
--- a/monav/utils/edgeconnector.h
+++ b/monav/utils/edgeconnector.h
@@ -22,7 +22,7 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "utils/coordinates.h"
 #include <vector>
-#include <QtCore/QMultiHash>
+#include <QMultiHash>
 #include <algorithm>
 
 static uint qHash( const UnsignedCoordinate& key )
diff --git a/monav/utils/qthelpers.h b/monav/utils/qthelpers.h
index 20e1445..871b4c8 100644
--- a/monav/utils/qthelpers.h
+++ b/monav/utils/qthelpers.h
@@ -20,11 +20,11 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef QTHELPERS_H
 #define QTHELPERS_H
 
-#include <QtCore/QFile>
-#include <QtCore/QtDebug>
-#include <QtCore/QDataStream>
-#include <QtCore/QTime>
-#include <QtCore/QDir>
+#include <QFile>
+#include <QtDebug>
+#include <QDataStream>
+#include <QTime>
+#include <QDir>
 
 static inline QString fileInDirectory( QString directory, QString filename )
 {