Revert "first try to fix building with OpenWRT toolchain that does not include QtCore and QtGui in the include path"

This reverts commit da88ec21cd.

This was not the right solution

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 {

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 <QFile>
-#include <QtCore/QHash>
+#include <QHash>
 #include <limits>
-#include <QtCore/QtDebug>
+#include <QtDebug>
 
 // Block must have member function / variables:
 // variable id => block id

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 <QString>
-#include <QtCore/QFile>
+#include <QFile>
 #include <algorithm>
 #include <vector>
 

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()

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 <QObject>
-#include <QtCore/QStringList>
+#include <QStringList>
 #include "interfaces/irouter.h"
 #include "binaryheap.h"
 #include "compressedgraph.h"

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 <QtDebug>
-#include <QtCore/QHash>
+#include <QHash>
 #include <algorithm>
 #include "utils/qthelpers.h"
 #ifndef NOGUI
-	#include <QtGui/QInputDialog>
+	#include <QInputDialog>
 #endif
-#include <QtCore/QSettings>
+#include <QSettings>
 
 GPSGridClient::GPSGridClient()
 {

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 <QObject>
-#include <QtCore/QFile>
+#include <QFile>
 #include "interfaces/igpslookup.h"
 #include "cell.h"
 #include "table.h"
-#include <QtCore/QCache>
+#include <QCache>
 
 class GPSGridClient : public QObject, public IGPSLookup
 {

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 <QtGlobal>
-#include <QtCore/QCache>
+#include <QCache>
-#include <QtCore/QFile>
+#include <QFile>
 #include <string.h>
 #include <vector>
-#include <QtCore/QtDebug>
+#include <QtDebug>
 
 namespace gg {
 

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 <QtPlugin>
-#include <QtCore/QVector>
+#include <QVector>
 
 class IAddressLookup
 {

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 <QtPlugin>
-#include <QtCore/QVector>
+#include <QVector>
 
 class IGPSLookup
 {

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 <QtPlugin>
-#include <QtCore/QVector>
+#include <QVector>
 
 class IRouter
 {

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"

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()

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 <QObject>
-#include <QtCore/QtPlugin>
+#include <QtPlugin>
-#include <QtCore/QFile>
+#include <QFile>
 #include "interfaces/iaddresslookup.h"
 #include "trie.h"
 

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 )

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 <QFile>
-#include <QtCore/QtDebug>
+#include <QtDebug>
-#include <QtCore/QDataStream>
+#include <QDataStream>
-#include <QtCore/QTime>
+#include <QTime>
-#include <QtCore/QDir>
+#include <QDir>
 
 static inline QString fileInDirectory( QString directory, QString filename )
 {