diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 10:00:25 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 10:00:25 -0600 |
commit | 1623fe64102c18ab098b79656b80f28cef840756 (patch) | |
tree | 78f35fef11ea3dbbca1ba4c99937736a1a0894cf /src/profileengine/lib | |
parent | b6ba5d642f3fc7d320e3d6f4650eb259a3a52b04 (diff) | |
download | tdevelop-1623fe64102c18ab098b79656b80f28cef840756.tar.gz tdevelop-1623fe64102c18ab098b79656b80f28cef840756.zip |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit b6ba5d642f3fc7d320e3d6f4650eb259a3a52b04.
Diffstat (limited to 'src/profileengine/lib')
-rw-r--r-- | src/profileengine/lib/profile.cpp | 6 | ||||
-rw-r--r-- | src/profileengine/lib/profile.h | 4 | ||||
-rw-r--r-- | src/profileengine/lib/profileengine.cpp | 30 | ||||
-rw-r--r-- | src/profileengine/lib/profileengine.h | 8 |
4 files changed, 24 insertions, 24 deletions
diff --git a/src/profileengine/lib/profile.cpp b/src/profileengine/lib/profile.cpp index 68666f3a..ac30ff87 100644 --- a/src/profileengine/lib/profile.cpp +++ b/src/profileengine/lib/profile.cpp @@ -59,18 +59,18 @@ Profile::Profile(Profile *parent, const TQString &name, const TQString &genericN Profile::~Profile() { - for (TQValueList<Profile*>::iterator it = m_children.begin(); it != m_children.end(); ++it) + for (TQValueList<Profile*>::iterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it) delete *it; } void Profile::addChildProfile(Profile *profile) { - m_children.append(profile); + m_tqchildren.append(profile); } void Profile::removeChildProfile(Profile *profile) { - m_children.remove(profile); + m_tqchildren.remove(profile); } TQString Profile::dirName() const diff --git a/src/profileengine/lib/profile.h b/src/profileengine/lib/profile.h index 857ddf39..3cbfd6f5 100644 --- a/src/profileengine/lib/profile.h +++ b/src/profileengine/lib/profile.h @@ -49,7 +49,7 @@ public: Profile(Profile *parent, const TQString &name, const TQString &genericName, const TQString &description); ~Profile(); - TQValueList<Profile*> children() const { return m_children; } + TQValueList<Profile*> tqchildren() const { return m_tqchildren; } Profile *parent() const { return m_parent; } void save(); @@ -81,7 +81,7 @@ protected: private: Profile *m_parent; - TQValueList<Profile*> m_children; + TQValueList<Profile*> m_tqchildren; TQString m_name; diff --git a/src/profileengine/lib/profileengine.cpp b/src/profileengine/lib/profileengine.cpp index 48a4e4e2..d21a6b58 100644 --- a/src/profileengine/lib/profileengine.cpp +++ b/src/profileengine/lib/profileengine.cpp @@ -78,24 +78,24 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType if (!profile) return KTrader::OfferList(); - TQString constraint = TQString::fromLatin1("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION); + TQString constraint = TQString::tqfromLatin1("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION); switch (offerType) { case Global: - constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Global'"); + constraint += TQString::tqfromLatin1(" and [X-KDevelop-Scope] == 'Global'"); break; case Project: - constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Project'"); + constraint += TQString::tqfromLatin1(" and [X-KDevelop-Scope] == 'Project'"); break; case Core: - constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Core'"); + constraint += TQString::tqfromLatin1(" and [X-KDevelop-Scope] == 'Core'"); break; } TQString constraint_add = ""; Profile::EntryList properties = profile->list(Profile::Properties); int i = 0; for (Profile::EntryList::const_iterator it = properties.begin(); it != properties.end(); ++it) - constraint_add += TQString::fromLatin1(" %1 '%2' in [X-KDevelop-Properties]"). - arg((i++)==0?"":"or").arg((*it).name); + constraint_add += TQString::tqfromLatin1(" %1 '%2' in [X-KDevelop-Properties]"). + tqarg((i++)==0?"":"or").tqarg((*it).name); if (!constraint_add.isEmpty()) constraint += " and ( " + constraint_add + " ) "; @@ -106,7 +106,7 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType << " " << constraint << endl << endl << endl;*/ //END debug - KTrader::OfferList list = KTrader::self()->query(TQString::fromLatin1("KDevelop/Plugin"), constraint); + KTrader::OfferList list = KTrader::self()->query(TQString::tqfromLatin1("KDevelop/Plugin"), constraint); TQStringList names; /* Wrong, this is not what we want to do. @@ -129,9 +129,9 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType { if (names.contains((*it).name)) continue; - TQString constraint = TQString::fromLatin1("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION); - constraint += TQString::fromLatin1("and [Name] == '%1'").arg((*it).name); - KTrader::OfferList enable = KTrader::self()->query(TQString::fromLatin1("KDevelop/Plugin"), constraint); + TQString constraint = TQString::tqfromLatin1("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION); + constraint += TQString::tqfromLatin1("and [Name] == '%1'").tqarg((*it).name); + KTrader::OfferList enable = KTrader::self()->query(TQString::tqfromLatin1("KDevelop/Plugin"), constraint); list += enable; } @@ -149,19 +149,19 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType KTrader::OfferList ProfileEngine::allOffers(OfferType offerType) { - TQString constraint = TQString::fromLatin1("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION); + TQString constraint = TQString::tqfromLatin1("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION); switch (offerType) { case Global: - constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Global'"); + constraint += TQString::tqfromLatin1(" and [X-KDevelop-Scope] == 'Global'"); break; case Project: - constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Project'"); + constraint += TQString::tqfromLatin1(" and [X-KDevelop-Scope] == 'Project'"); break; case Core: - constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Core'"); + constraint += TQString::tqfromLatin1(" and [X-KDevelop-Scope] == 'Core'"); break; } - return KTrader::self()->query(TQString::fromLatin1("KDevelop/Plugin"), constraint); + return KTrader::self()->query(TQString::tqfromLatin1("KDevelop/Plugin"), constraint); } void ProfileEngine::getProfileWithListing(ProfileListing &listing, Profile **profile, diff --git a/src/profileengine/lib/profileengine.h b/src/profileengine/lib/profileengine.h index 6404e48f..d34f9e02 100644 --- a/src/profileengine/lib/profileengine.h +++ b/src/profileengine/lib/profileengine.h @@ -177,8 +177,8 @@ public: template<class Operation> void walkProfiles(Operation &op, Profile *root) { - TQValueList<Profile*> children = root->children(); - for (TQValueList<Profile*>::iterator it = children.begin(); it != children.end(); ++it) + TQValueList<Profile*> tqchildren = root->tqchildren(); + for (TQValueList<Profile*>::iterator it = tqchildren.begin(); it != tqchildren.end(); ++it) { op(*it); walkProfiles<Operation>(op, *it); @@ -244,8 +244,8 @@ public: template<class Operation, class Result> void walkProfiles(Operation &op, Result *result, Profile *root) { - TQValueList<Profile*> children = root->children(); - for (TQValueList<Profile*>::iterator it = children.begin(); it != children.end(); ++it) + TQValueList<Profile*> tqchildren = root->tqchildren(); + for (TQValueList<Profile*>::iterator it = tqchildren.begin(); it != tqchildren.end(); ++it) { Result *newResult = op(result, *it); walkProfiles<Operation>(op, newResult, *it); |