From 10308be19ef7fa44699562cc75946e7ea1fdf6b9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 7 Jan 2011 03:45:53 +0000 Subject: Revert automated changes Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kdecore/kconfigskeleton.h | 54 +++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'kdecore/kconfigskeleton.h') diff --git a/kdecore/kconfigskeleton.h b/kdecore/kconfigskeleton.h index e6c3b8d20..82185c090 100644 --- a/kdecore/kconfigskeleton.h +++ b/kdecore/kconfigskeleton.h @@ -376,7 +376,7 @@ public: ItemString(const TQString & group, const TQString & key, TQString & reference, - const TQString & defaultValue = TQString::tqfromLatin1(""), // NOT TQString::null !! + const TQString & defaultValue = TQString::fromLatin1(""), // NOT TQString::null !! Type type = Normal); void writeConfig(KConfig * config); @@ -396,7 +396,7 @@ public: public: ItemPassword(const TQString & group, const TQString & key, TQString & reference, - const TQString & defaultValue = TQString::tqfromLatin1("")); // NOT TQString::null !! + const TQString & defaultValue = TQString::fromLatin1("")); // NOT TQString::null !! }; /** @@ -469,11 +469,11 @@ public: /** * Class for handling an 64-bit integer preferences item. */ - class KDECORE_EXPORT ItemInt64:public KConfigSkeletonGenericItem < TQ_INT64 > + class KDECORE_EXPORT ItemInt64:public KConfigSkeletonGenericItem < Q_INT64 > { public: - ItemInt64(const TQString & group, const TQString & key, TQ_INT64 &reference, - TQ_INT64 defaultValue = 0); + ItemInt64(const TQString & group, const TQString & key, Q_INT64 &reference, + Q_INT64 defaultValue = 0); void readConfig(KConfig * config); void setProperty(const TQVariant & p); @@ -482,14 +482,14 @@ public: TQVariant minValue() const; TQVariant maxValue() const; - void setMinValue(TQ_INT64); - void setMaxValue(TQ_INT64); + void setMinValue(Q_INT64); + void setMaxValue(Q_INT64); private: bool mHasMin : 1; bool mHasMax : 1; - TQ_INT64 mMin; - TQ_INT64 mMax; + Q_INT64 mMin; + Q_INT64 mMax; }; /** @@ -598,11 +598,11 @@ public: /** * Class for handling unsigned 64-bit integer preferences item. */ - class KDECORE_EXPORT ItemUInt64:public KConfigSkeletonGenericItem < TQ_UINT64 > + class KDECORE_EXPORT ItemUInt64:public KConfigSkeletonGenericItem < Q_UINT64 > { public: - ItemUInt64(const TQString & group, const TQString & key, TQ_UINT64 &reference, - TQ_UINT64 defaultValue = 0); + ItemUInt64(const TQString & group, const TQString & key, Q_UINT64 &reference, + Q_UINT64 defaultValue = 0); void readConfig(KConfig * config); void setProperty(const TQVariant & p); @@ -611,14 +611,14 @@ public: TQVariant minValue() const; TQVariant maxValue() const; - void setMinValue(TQ_UINT64); - void setMaxValue(TQ_UINT64); + void setMinValue(Q_UINT64); + void setMaxValue(Q_UINT64); private: bool mHasMin : 1; bool mHasMax : 1; - TQ_UINT64 mMin; - TQ_UINT64 mMax; + Q_UINT64 mMin; + Q_UINT64 mMax; }; /** @@ -859,7 +859,7 @@ public: * @return The created item */ ItemString *addItemString(const TQString & name, TQString & reference, - const TQString & defaultValue = TQString::tqfromLatin1(""), // NOT TQString::null !! + const TQString & defaultValue = TQString::fromLatin1(""), // NOT TQString::null !! const TQString & key = TQString::null); /** @@ -876,7 +876,7 @@ public: * @return The created item */ ItemPassword *addItemPassword(const TQString & name, TQString & reference, - const TQString & defaultValue = TQString::tqfromLatin1(""), + const TQString & defaultValue = TQString::fromLatin1(""), const TQString & key = TQString::null); /** @@ -893,7 +893,7 @@ public: * @return The created item */ ItemPath *addItemPath(const TQString & name, TQString & reference, - const TQString & defaultValue = TQString::tqfromLatin1(""), + const TQString & defaultValue = TQString::fromLatin1(""), const TQString & key = TQString::null); /** @@ -987,7 +987,7 @@ public: const TQString & key = TQString::null); /** - * Register an item of type TQ_INT64. + * Register an item of type Q_INT64. * * @param name Name used to indentify this setting. Names must be unique. * @param reference Pointer to the variable, which is set by readConfig() @@ -997,12 +997,12 @@ public: * @param key Key used in config file. If key is null, name is used as key. * @return The created item */ - ItemInt64 *addItemInt64(const TQString & name, TQ_INT64 &reference, - TQ_INT64 defaultValue = 0, + ItemInt64 *addItemInt64(const TQString & name, Q_INT64 &reference, + Q_INT64 defaultValue = 0, const TQString & key = TQString::null); /** - * Register an item of type TQ_UINT64 + * Register an item of type Q_UINT64 * * @param name Name used to indentify this setting. Names must be unique. * @param reference Pointer to the variable, which is set by readConfig() @@ -1012,8 +1012,8 @@ public: * @param key Key used in config file. If key is null, name is used as key. * @return The created item */ - ItemUInt64 *addItemUInt64(const TQString & name, TQ_UINT64 &reference, - TQ_UINT64 defaultValue = 0, + ItemUInt64 *addItemUInt64(const TQString & name, Q_UINT64 &reference, + Q_UINT64 defaultValue = 0, const TQString & key = TQString::null); /** @@ -1174,7 +1174,7 @@ public: /** * Lookup item by name */ - KConfigSkeletonItem * tqfindItem(const TQString & name); + KConfigSkeletonItem * findItem(const TQString & name); /** * Indicate whether this object should reflect the actual @@ -1187,7 +1187,7 @@ public: protected: /** * Implemented by subclasses that use special defaults. - * It should tqreplace the default values with the actual + * It should replace the default values with the actual * values and vice versa. */ virtual void usrUseDefaults(bool) -- cgit v1.2.1