Changeset 07e43cf61a in tspsg for src/globals.h

Timestamp:

Oct 5, 2012, 5:30:23 PM (12 years ago)

Author:

Oleksii Serdiuk

Branches:

appveyor, imgbot, master, readme

Children:

47c811cc09

Parents:

7a39458d16

git-author:

Oleksii Serdiuk <contacts@…> (10/05/12 17:30:23)

git-committer:

Oleksii Serdiuk <contacts@…> (10/05/12 21:58:30)

Message:

Improved compilation time by about 30%.

By reducing number of includes to only required minimum.

NOTE: Compilation time comparison was done by measuring compilation time
while using only one thread (i.e., "make -j1").

File:

• src/globals.h (modified) (7 diffs)

src/globals.h

@@ -30 +30 @@
 
 // INCLUDES
-#include <QtCore>
+#include <QtGlobal>
 #if QT_VERSION < QT_VERSION_CHECK(4,5,0)
 #   error You are using Qt version < 4.5 but minimum required version is 4.5.0. Compilation aborted.
@@ -39 +39 @@
 #   define QT_NO_STATUSTIP
 #endif
-#include <QtGui>
 #if defined(QT_NO_SVG) && !defined(NOSVG)
 #   define NOSVG
 #endif
-#if !defined(NOSVG)
-#   include <QtSvg>
-#endif // NOSVG
-#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
-#   include <QtConcurrent>
-#   include <QtPrintSupport>
-#endif
 
-#ifndef HANDHELD
-#   include "qttoolbardialog.h"
-#endif
-
-// Version info
-#include "version.h"
-// OS and ARCH detection
-#include "os.h"
 // TSPSG Defaults
 #include "defaults.h"
-// TSPSolver
-#include "tspsolver.h"
-#ifndef HANDHELD
-    // Eyecandy
-#   include "qtwin.h"
-#endif // HANDHELD
 
 // DEFINES
@@ -84 +62 @@
 /*!
  * \def PATH_DOCS
- * \brief Bath to documentation files.
+ * \brief Path to documentation files.
  */
 #ifndef PATH_DOCS
@@ -111 +89 @@
 #define HQ_FACTOR 2
 
-// FUNCTIONS
-/*!
- * \brief Checks whether \a x contains an integer value.
- * \param x A value to check.
- * \return \c true if \a x countains an integer, oherwise \c false.
- */
-inline bool isInteger(double x)
-{
-double i;
-    return (modf(x, &i) == 0.0);
-}
-
 /*!
  * \brief Checks whether the updater app is installed/available.
@@ -129 +95 @@
  *  On other systems this function always returns \c false.
  */
-inline bool hasUpdater()
-{
-#ifdef Q_OS_WIN32
-    return QFile::exists("updater/Update.exe");
-#else // Q_OS_WIN32
-    return false;
-#endif // Q_OS_WIN32
-}
+bool hasUpdater();
 
-/*!
- * \brief Converts \a in into Base64 format with lines wrapped at 64 characters.
- * \param in A byte array to be converted.
- * \return Converted byte array.
- */
-inline QByteArray toWrappedBase64(const QByteArray &in)
-{
-    QByteArray out, base64(in.toBase64());
-    for (int i = 0; i <= base64.size() - 64; i += 64) {
-        out.append(QByteArray::fromRawData(base64.data() + i, 64)).append('\n');
-    }
-    if (int rest = base64.size() % 64)
-        out.append(QByteArray::fromRawData(base64.data() + base64.size() - rest, rest));
-    return out;
-}
-
+class QSettings;
+class QObject;
 /*!
  * \brief Creates QSettings instance with TSPSG-specific options.
@@ -162 +107 @@
 
 #ifndef HANDHELD
+class QWidget;
 /*!
  * \brief Enables or disables a mask for the \a widget.
@@ -173 +119 @@
 
 #ifndef DOXYGEN_EXCLUDE
-
-#ifndef QT_NO_PRINTER
-    Q_DECLARE_METATYPE(QPrinter::PageSize)
-    Q_DECLARE_METATYPE(QPrinter::Orientation)
-#endif
 
 #ifdef HANDHELD