Changeset 149 in tspsg-svn for trunk/src/globals.h


Ignore:
Timestamp:
Dec 20, 2010, 9:53:45 PM (14 years ago)
Author:
laleppa
Message:

Converted file formatting to have spaces instead of tabs. No code changes...

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/globals.h

    r143 r149  
    3232#include <QtCore>
    3333#if QT_VERSION < 0x040500
    34         #error You are using Qt version < 4.5 but minimum required version is 4.5.0. Compilation aborted.
     34#   error You are using Qt version < 4.5 but minimum required version is 4.5.0. Compilation aborted.
    3535#endif
    3636#if defined(Q_WS_WINCE_WM) || defined(Q_WS_S60) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
    37         //! This is defined on handheld devices (e.g., Windows Mobile, Symbian).
    38         #define HANDHELD
    39         #define QT_NO_STATUSTIP
     37    //! This is defined on handheld devices (e.g., Windows Mobile, Symbian).
     38#   define HANDHELD
     39#   define QT_NO_STATUSTIP
    4040#endif
    4141#include <QtGui>
    4242#if defined(QT_NO_SVG) && !defined(NOSVG)
    43         #define NOSVG
     43#   define NOSVG
    4444#endif
    4545#if !defined(NOSVG)
    46         #include <QtSvg>
     46#   include <QtSvg>
    4747#endif // NOSVG
    4848
    4949#ifndef HANDHELD
    50         #include "qttoolbardialog.h"
     50#   include "qttoolbardialog.h"
    5151#endif
    5252
     
    6060#include "tspsolver.h"
    6161#ifdef Q_WS_WIN32
    62         // Vista/7 Eyecandy
    63         #include "qtwin.h"
     62    // Vista/7 Eyecandy
     63#   include "qtwin.h"
    6464#endif // Q_WS_WIN32
    6565
     
    7676 */
    7777#ifndef PATH_L10N
    78         #define PATH_L10N "l10n"
     78#   define PATH_L10N "l10n"
    7979#endif // PATH_L10N
    8080/*!
     
    8383 */
    8484#ifndef PATH_DOCS
    85         #define PATH_DOCS "help"
     85#   define PATH_DOCS "help"
    8686#endif // PATH_DOCS
    8787
     
    111111{
    112112double i;
    113         return (modf(x, &i) == 0.0);
     113    return (modf(x, &i) == 0.0);
    114114}
    115115
     
    123123{
    124124#ifdef Q_WS_WIN32
    125         return QFile::exists("updater/Update.exe");
     125    return QFile::exists("updater/Update.exe");
    126126#else // Q_WS_WIN32
    127         return false;
     127    return false;
    128128#endif // Q_WS_WIN32
    129129}
     
    143143
    144144#ifdef HANDHELD
    145         #define ICON_SIZE "32x32"
    146         #define ICON_FORMAT "png"
     145#   define ICON_SIZE "32x32"
     146#   define ICON_FORMAT "png"
    147147#else
    148         #define ICON_SIZE "128x128"
    149         #define ICON_FORMAT "png"
     148#   define ICON_SIZE "128x128"
     149#   define ICON_FORMAT "png"
    150150#endif
    151151
    152152#if QT_VERSION >= 0x040600
    153         #define GET_ICON(x) QIcon::fromTheme(x, QIcon(":/images/icons/"ICON_SIZE"/"x"."ICON_FORMAT))
     153#   define GET_ICON(x) QIcon::fromTheme(x, QIcon(":/images/icons/"ICON_SIZE"/"x"."ICON_FORMAT))
    154154#else
    155         #define GET_ICON(x) QIcon(":/images/icons/"ICON_SIZE"/"x"."ICON_FORMAT)
     155#   define GET_ICON(x) QIcon(":/images/icons/"ICON_SIZE"/"x"."ICON_FORMAT)
    156156#endif
    157157
     
    159159// Check that default number of cities is sane (<= MAX_NUM_CITIES)
    160160#if DEF_NUM_CITIES > MAX_NUM_CITIES
    161         #undef DEF_NUM_CITIES
    162         #define DEF_NUM_CITIES MAX_NUM_CITIES
     161#   undef DEF_NUM_CITIES
     162#   define DEF_NUM_CITIES MAX_NUM_CITIES
    163163#endif
    164164// Check that maximum for random generation is sane (<= MAX_RAND_VALUE)
    165165#if DEF_RAND_MAX > MAX_RAND_VALUE
    166         #undef DEF_RAND_MAX
    167         #define DEF_RAND_MAX MAX_RAND_VALUE
     166#   undef DEF_RAND_MAX
     167#   define DEF_RAND_MAX MAX_RAND_VALUE
    168168#endif
    169169// Check that DEF_RAND_MIN <= DEF_RAND_MAX
    170170#if DEF_RAND_MIN > DEF_RAND_MAX
    171         #undef DEF_RAND_MIN
    172         #define DEF_RAND_MIN DEF_RAND_MAX
     171#   undef DEF_RAND_MIN
     172#   define DEF_RAND_MIN DEF_RAND_MAX
    173173#endif
    174174
Note: See TracChangeset for help on using the changeset viewer.