qi-hardware/nanomap
1
0
Fork 0
mirror of git://projects.qi-hardware.com/nanomap.git synced 2024-11-25 06:00:37 +02:00
Code

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

Browse Source
This commit is contained in:
Niels 2010-11-17 14:11:42 +01:00
parent bdecafa5bd
commit da88ec21cd
16 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
monav/contractionhierarchies/binaryheap.h
View File

@ -24,7 +24,7 @@ along with MoNav. If not, see <http://www.gnu.org/licenses/>.
#include <cassert> #include <cassert>
#include <vector> #include <vector>
#include <QHash> #include <QtCore/QHash>
template< typename NodeID, typename Key > template< typename NodeID, typename Key >
class ArrayStorage { class ArrayStorage {

6
monav/contractionhierarchies/blockcache.h
View File

@ -20,10 +20,10 @@ along with MoNav. If not, see <http://www.gnu.org/licenses/>.
#ifndef BLOCKCACHE_H_INCLUDED #ifndef BLOCKCACHE_H_INCLUDED
#define BLOCKCACHE_H_INCLUDED #define BLOCKCACHE_H_INCLUDED
#include <QFile> #include <QtCore/QFile>
#include <QHash> #include <QtCore/QHash>
#include <limits> #include <limits>
#include <QtDebug> #include <QtCore/QtDebug>
// Block must have member function / variables: // Block must have member function / variables:
// variable id => block id // variable id => block id

4
monav/contractionhierarchies/compressedgraph.h
View File

@ -24,8 +24,8 @@ along with MoNav. If not, see <http://www.gnu.org/licenses/>.
#include "utils/coordinates.h" #include "utils/coordinates.h"
#include "utils/bithelpers.h" #include "utils/bithelpers.h"
#include "blockcache.h" #include "blockcache.h"
#include <QString> #include <QtCore/QString>
#include <QFile> #include <QtCore/QFile>
#include <algorithm> #include <algorithm>
#include <vector> #include <vector>

4
monav/contractionhierarchies/contractionhierarchiesclient.cpp
View File

@ -22,10 +22,10 @@ along with MoNav. If not, see <http://www.gnu.org/licenses/>.
#include "contractionhierarchiesclient.h" #include "contractionhierarchiesclient.h"
#include "utils/qthelpers.h" #include "utils/qthelpers.h"
#include <QtDebug> #include <QtCore/QtDebug>
#include <stack> #include <stack>
#ifndef NOGUI #ifndef NOGUI
#include <QMessageBox> #include <QtGui/QMessageBox>
#endif #endif
ContractionHierarchiesClient::ContractionHierarchiesClient() ContractionHierarchiesClient::ContractionHierarchiesClient()

4
monav/contractionhierarchies/contractionhierarchiesclient.h
View File

@ -20,8 +20,8 @@ along with MoNav. If not, see <http://www.gnu.org/licenses/>.
#ifndef CONTRACTIONHIERARCHIESCLIENT_H #ifndef CONTRACTIONHIERARCHIESCLIENT_H
#define CONTRACTIONHIERARCHIESCLIENT_H #define CONTRACTIONHIERARCHIESCLIENT_H
#include <QObject> #include <QtCore/QObject>
#include <QStringList> #include <QtCore/QStringList>
#include "interfaces/irouter.h" #include "interfaces/irouter.h"
#include "binaryheap.h" #include "binaryheap.h"
#include "compressedgraph.h" #include "compressedgraph.h"

8
monav/gpsgrid/gpsgridclient.cpp
View File

@ -18,14 +18,14 @@ along with MoNav. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "gpsgridclient.h" #include "gpsgridclient.h"
#include <QtDebug> #include <QtCore/QtDebug>
#include <QHash> #include <QtCore/QHash>
#include <algorithm> #include <algorithm>
#include "utils/qthelpers.h" #include "utils/qthelpers.h"
#ifndef NOGUI #ifndef NOGUI
#include <QInputDialog> #include <QtGui/QInputDialog>
#endif #endif
#include <QSettings> #include <QtCore/QSettings>
GPSGridClient::GPSGridClient() GPSGridClient::GPSGridClient()
{ {

6
monav/gpsgrid/gpsgridclient.h
View File

@ -20,12 +20,12 @@ along with MoNav. If not, see <http://www.gnu.org/licenses/>.
#ifndef GPSGRIDCLIENT_H #ifndef GPSGRIDCLIENT_H
#define GPSGRIDCLIENT_H #define GPSGRIDCLIENT_H
#include <QObject> #include <QtCore/QObject>
#include <QFile> #include <QtCore/QFile>
#include "interfaces/igpslookup.h" #include "interfaces/igpslookup.h"
#include "cell.h" #include "cell.h"
#include "table.h" #include "table.h"
#include <QCache> #include <QtCore/QCache>
class GPSGridClient : public QObject, public IGPSLookup class GPSGridClient : public QObject, public IGPSLookup
{ {

8
monav/gpsgrid/table.h
View File

@ -20,12 +20,12 @@ along with MoNav. If not, see <http://www.gnu.org/licenses/>.
#ifndef TABLE_H #ifndef TABLE_H
#define TABLE_H #define TABLE_H
#include <QtGlobal> #include <QtCore/QtGlobal>
#include <QCache> #include <QtCore/QCache>
#include <QFile> #include <QtCore/QFile>
#include <string.h> #include <string.h>
#include <vector> #include <vector>
#include <QtDebug> #include <QtCore/QtDebug>
namespace gg { namespace gg {

4
monav/interfaces/iaddresslookup.h
View File

@ -21,8 +21,8 @@ along with MoNav. If not, see <http://www.gnu.org/licenses/>.
#define IADDRESSLOOKUP_H #define IADDRESSLOOKUP_H
#include "utils/coordinates.h" #include "utils/coordinates.h"
#include <QtPlugin> #include <QtCore/QtPlugin>
#include <QVector> #include <QtCore/QVector>
class IAddressLookup class IAddressLookup
{ {

4
monav/interfaces/igpslookup.h
View File

@ -22,8 +22,8 @@ along with MoNav. If not, see <http://www.gnu.org/licenses/>.
#include "utils/config.h" #include "utils/config.h"
#include "utils/coordinates.h" #include "utils/coordinates.h"
#include <QtPlugin> #include <QtCore/QtPlugin>
#include <QVector> #include <QtCore/QVector>
class IGPSLookup class IGPSLookup
{ {

4
monav/interfaces/irouter.h
View File

@ -23,8 +23,8 @@ along with MoNav. If not, see <http://www.gnu.org/licenses/>.
#include "utils/config.h" #include "utils/config.h"
#include "utils/coordinates.h" #include "utils/coordinates.h"
#include "interfaces/igpslookup.h" #include "interfaces/igpslookup.h"
#include <QtPlugin> #include <QtCore/QtPlugin>
#include <QVector> #include <QtCore/QVector>
class IRouter class IRouter
{ {

2
monav/unicodetournamenttrie/trie.h
View File

@ -20,7 +20,7 @@ along with MoNav. If not, see <http://www.gnu.org/licenses/>.
#ifndef TRIE_H #ifndef TRIE_H
#define TRIE_H #define TRIE_H
#include <QString> #include <QtCore/QString>
#include <vector> #include <vector>
#include "utils/coordinates.h" #include "utils/coordinates.h"
#include "utils/bithelpers.h" #include "utils/bithelpers.h"

4
monav/unicodetournamenttrie/unicodetournamenttrieclient.cpp
View File

@ -23,10 +23,10 @@ along with MoNav. If not, see <http://www.gnu.org/licenses/>.
#include "unicodetournamenttrieclient.h" #include "unicodetournamenttrieclient.h"
#include "utils/qthelpers.h" #include "utils/qthelpers.h"
#include <QtDebug> #include <QtCore/QtDebug>
#include <algorithm> #include <algorithm>
#ifndef NOGUI #ifndef NOGUI
#include <QMessageBox> #include <QtGui/QMessageBox>
#endif #endif
UnicodeTournamentTrieClient::UnicodeTournamentTrieClient() UnicodeTournamentTrieClient::UnicodeTournamentTrieClient()

6
monav/unicodetournamenttrie/unicodetournamenttrieclient.h
View File

@ -20,9 +20,9 @@ along with MoNav. If not, see <http://www.gnu.org/licenses/>.
#ifndef UNICODETOURNAMENTTRIECLIENT_H #ifndef UNICODETOURNAMENTTRIECLIENT_H
#define UNICODETOURNAMENTTRIECLIENT_H #define UNICODETOURNAMENTTRIECLIENT_H
#include <QObject> #include <QtCore/QObject>
#include <QtPlugin> #include <QtCore/QtPlugin>
#include <QFile> #include <QtCore/QFile>
#include "interfaces/iaddresslookup.h" #include "interfaces/iaddresslookup.h"
#include "trie.h" #include "trie.h"

2
monav/utils/edgeconnector.h
View File

@ -22,7 +22,7 @@ along with MoNav. If not, see <http://www.gnu.org/licenses/>.
#include "utils/coordinates.h" #include "utils/coordinates.h"
#include <vector> #include <vector>
#include <QMultiHash> #include <QtCore/QMultiHash>
#include <algorithm> #include <algorithm>
static uint qHash( const UnsignedCoordinate& key ) static uint qHash( const UnsignedCoordinate& key )

10
monav/utils/qthelpers.h
View File

@ -20,11 +20,11 @@ along with MoNav. If not, see <http://www.gnu.org/licenses/>.
#ifndef QTHELPERS_H #ifndef QTHELPERS_H
#define QTHELPERS_H #define QTHELPERS_H
#include <QFile> #include <QtCore/QFile>
#include <QtDebug> #include <QtCore/QtDebug>
#include <QDataStream> #include <QtCore/QDataStream>
#include <QTime> #include <QtCore/QTime>
#include <QDir> #include <QtCore/QDir>
static inline QString fileInDirectory( QString directory, QString filename ) static inline QString fileInDirectory( QString directory, QString filename )
{ {