summaryrefslogtreecommitdiff
path: root/qmake/include/private
authorzecke <zecke>2004-07-15 17:36:57 (UTC)
committer zecke <zecke>2004-07-15 17:36:57 (UTC)
commit323e9a7472a110b4befba7320540263147505bae (patch) (side-by-side diff)
tree14c810bdb9c0603a30356b17b4bdf9ccb72741c6 /qmake/include/private
parentaa292b322f1ecb43dd8f4e3cd295855730dd9f59 (diff)
downloadopie-323e9a7472a110b4befba7320540263147505bae.zip
opie-323e9a7472a110b4befba7320540263147505bae.tar.gz
opie-323e9a7472a110b4befba7320540263147505bae.tar.bz2
Manually updatet to qmake1.06a which includes support for precompiled
headers. Opies 'PRO' keyword was already reintroduced
Diffstat (limited to 'qmake/include/private') (more/less context) (ignore whitespace changes)
-rw-r--r--qmake/include/private/qdir_p.h2
-rw-r--r--qmake/include/private/qlocale_p.h128
-rw-r--r--qmake/include/private/qsettings_p.h30
3 files changed, 150 insertions, 10 deletions
diff --git a/qmake/include/private/qdir_p.h b/qmake/include/private/qdir_p.h
index a6c7c91..4d9dfc6 100644
--- a/qmake/include/private/qdir_p.h
+++ b/qmake/include/private/qdir_p.h
@@ -1,5 +1,5 @@
/****************************************************************************
-** $Id$
+**
**
** Definition of some private QDir functions.
**
diff --git a/qmake/include/private/qlocale_p.h b/qmake/include/private/qlocale_p.h
new file mode 100644
index 0000000..26c05c9
--- a/dev/null
+++ b/qmake/include/private/qlocale_p.h
@@ -0,0 +1,128 @@
+/****************************************************************************
+**
+**
+** Declaration of the QLocalePrivate class
+**
+** Copyright (C) 1992-2003 Trolltech AS. All rights reserved.
+**
+** This file is part of the widgets module of the Qt GUI Toolkit.
+**
+** This file may be distributed under the terms of the Q Public License
+** as defined by Trolltech AS of Norway and appearing in the file
+** LICENSE.QPL included in the packaging of this file.
+**
+** This file may be distributed and/or modified under the terms of the
+** GNU General Public License version 2 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.
+**
+** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
+** licenses may use this file in accordance with the Qt Commercial License
+** Agreement provided with the Software.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
+** information about Qt Commercial License Agreements.
+** See http://www.trolltech.com/qpl/ for QPL licensing information.
+** See http://www.trolltech.com/gpl/ for GPL licensing information.
+**
+** Contact info@trolltech.com if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+
+#ifndef QLOCALE_P_H
+#define QLOCALE_P_H
+
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists for the convenience
+// of internal files. This header file may change from version to version
+// without notice, or even be removed.
+//
+// We mean it.
+//
+//
+
+#include <qstring.h>
+
+struct QLocalePrivate
+{
+public:
+ const QChar &decimal() const { return (QChar&)m_decimal; }
+ const QChar &group() const { return (QChar&)m_group; }
+ const QChar &list() const { return (QChar&)m_list; }
+ const QChar &percent() const { return (QChar&)m_percent; }
+ const QChar &zero() const { return (QChar&)m_zero; }
+ QChar plus() const { return QChar('+'); }
+ const QChar &minus() const { return (QChar&)m_minus; }
+ const QChar &exponential() const { return (QChar&)m_exponential; }
+ QString infinity() const;
+ QString nan() const;
+
+ Q_UINT32 languageId() const { return m_language_id; }
+ Q_UINT32 countryId() const { return m_country_id; }
+
+ bool isDigit(QChar d) const;
+
+ enum GroupSeparatorMode {
+ FailOnGroupSeparators,
+ ParseGroupSeparators
+ };
+
+ enum DoubleForm {
+ DFExponent = 0, // %e or %E
+ DFDecimal, // %f or %F
+ DFSignificantDigits, // %g or %G
+ _DFMax = DFSignificantDigits
+ };
+
+ enum Flags {
+ NoFlags = 0,
+
+ // These correspond to the options in a printf format string
+ Alternate = 0x01,
+ ZeroPadded = 0x02,
+ LeftAdjusted = 0x04,
+ BlankBeforePositive = 0x08,
+ AlwaysShowSign = 0x10,
+ ThousandsGroup = 0x20,
+ CapitalEorX = 0x40 // %x, %e, %f, %g vs. %X, %E, %F, %G
+ };
+
+ QString doubleToString(double d,
+ int precision = -1,
+ DoubleForm form = DFSignificantDigits,
+ int width = -1,
+ unsigned flags = NoFlags) const;
+ QString longLongToString(Q_LLONG l, int precision = -1,
+ int base = 10,
+ int width = -1,
+ unsigned flags = NoFlags) const;
+ QString unsLongLongToString(Q_ULLONG l, int precision = -1,
+ int base = 10,
+ int width = -1,
+ unsigned flags = NoFlags) const;
+ double stringToDouble(QString num, bool *ok, GroupSeparatorMode group_sep_mode) const;
+ Q_LLONG stringToLongLong(QString num, int base, bool *ok, GroupSeparatorMode group_sep_mode) const;
+ Q_ULLONG stringToUnsLongLong(QString num, int base, bool *ok, GroupSeparatorMode group_sep_mode) const;
+ bool removeGroupSeparators(QString &num_str) const;
+ bool numberToCLocale(QString &locale_num, GroupSeparatorMode group_sep_mode) const;
+
+ Q_UINT32 m_language_id, m_country_id;
+
+ Q_UINT16 m_decimal, m_group, m_list, m_percent,
+ m_zero, m_minus, m_exponential;
+
+ static const QString m_infinity;
+ static const QString m_nan;
+ static const QChar m_plus;
+
+ static const char *systemLocaleName();
+};
+
+#endif
diff --git a/qmake/include/private/qsettings_p.h b/qmake/include/private/qsettings_p.h
index 095291c..4b76f44 100644
--- a/qmake/include/private/qsettings_p.h
+++ b/qmake/include/private/qsettings_p.h
@@ -1,24 +1,34 @@
/****************************************************************************
-** $Id$
+**
**
** Definition of QSettings related classes
**
-** Copyright (C) 1992-2002 Trolltech AS. All rights reserved.
+** Created : 990124
**
-** This file is part of the tools module of the Qt GUI Toolkit.
+** Copyright (C) 1999-2002 Trolltech AS. All rights reserved.
**
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses for Windows may use this file in accordance with the Qt Commercial
-** License Agreement provided with the Software.
+** This file is part of the kernel module of the Qt GUI Toolkit.
+**
+** This file may be distributed under the terms of the Q Public License
+** as defined by Trolltech AS of Norway and appearing in the file
+** LICENSE.QPL included in the packaging of this file.
+**
+** This file may be distributed and/or modified under the terms of the
+** GNU General Public License version 2 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.
**
-** This file is not available for use under any other license without
-** express written permission from the copyright holder.
+** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
+** licenses may use this file in accordance with the Qt Commercial License
+** Agreement provided with the Software.
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
** information about Qt Commercial License Agreements.
+** See http://www.trolltech.com/qpl/ for QPL licensing information.
+** See http://www.trolltech.com/gpl/ for GPL licensing information.
**
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
@@ -46,6 +56,7 @@
#include "qvaluestack.h"
#endif // QT_H
+#ifndef QT_NO_SETTINGS
class QSettingsSysPrivate;
// QSettingsGroup is a map of key/value pairs
@@ -128,6 +139,7 @@ public:
void sysInsertSearchPath( QSettings::System, const QString & );
void sysRemoveSearchPath( QSettings::System, const QString & );
#endif
-};
+};
+#endif //QT_NO_SETTINGS
#endif // QSETTINGS_P_H