From 1623fe64102c18ab098b79656b80f28cef840756 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 10:00:25 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit b6ba5d642f3fc7d320e3d6f4650eb259a3a52b04. --- src/profileengine/editor/addprofilewidget.ui | 6 +++--- src/profileengine/editor/profileeditor.cpp | 12 +++++------ src/profileengine/editor/profileeditorbase.ui | 22 ++++++++++---------- src/profileengine/lib/profile.cpp | 6 +++--- src/profileengine/lib/profile.h | 4 ++-- src/profileengine/lib/profileengine.cpp | 30 +++++++++++++-------------- src/profileengine/lib/profileengine.h | 8 +++---- 7 files changed, 44 insertions(+), 44 deletions(-) (limited to 'src/profileengine') diff --git a/src/profileengine/editor/addprofilewidget.ui b/src/profileengine/editor/addprofilewidget.ui index 78d20d17..a44765ab 100644 --- a/src/profileengine/editor/addprofilewidget.ui +++ b/src/profileengine/editor/addprofilewidget.ui @@ -21,7 +21,7 @@ - layout6 + tqlayout6 @@ -53,7 +53,7 @@ - layout7 + tqlayout7 @@ -85,7 +85,7 @@ - layout8 + tqlayout8 diff --git a/src/profileengine/editor/profileeditor.cpp b/src/profileengine/editor/profileeditor.cpp index 93fe2850..99921768 100644 --- a/src/profileengine/editor/profileeditor.cpp +++ b/src/profileengine/editor/profileeditor.cpp @@ -18,10 +18,10 @@ ***************************************************************************/ #include "profileeditor.h" -#include +#include #include -#include -#include +#include +#include #include #include @@ -69,12 +69,12 @@ public: bool isDerived() const { return m_derived; } - virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) + virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) { TQColorGroup cgNew = cg; if (m_derived) cgNew.setColor(TQColorGroup::Text, KGlobalSettings::inactiveTextColor()); - KListViewItem::paintCell(p, cgNew, column, width, alignment); + KListViewItem::paintCell(p, cgNew, column, width, tqalignment); } private: @@ -115,7 +115,7 @@ void ProfileEditor::refresh() void ProfileEditor::refreshPropertyCombo() { - KTrader::OfferList list = KTrader::self()->query(TQString::fromLatin1("KDevelop/Plugin")); + KTrader::OfferList list = KTrader::self()->query(TQString::tqfromLatin1("KDevelop/Plugin")); TQStringList props; for (KTrader::OfferList::const_iterator it = list.constBegin(); it != list.constEnd(); ++it) { diff --git a/src/profileengine/editor/profileeditorbase.ui b/src/profileengine/editor/profileeditorbase.ui index 4c6af611..d66c4e31 100644 --- a/src/profileengine/editor/profileeditorbase.ui +++ b/src/profileengine/editor/profileeditorbase.ui @@ -49,7 +49,7 @@ - layout11 + tqlayout11 @@ -73,7 +73,7 @@ Expanding - + 20 142 @@ -192,7 +192,7 @@ - layout7 + tqlayout7 @@ -221,7 +221,7 @@ - layout8 + tqlayout8 @@ -263,7 +263,7 @@ - layout5 + tqlayout5 @@ -303,7 +303,7 @@ - layout6 + tqlayout6 @@ -359,7 +359,7 @@ Expanding - + 20 16 @@ -376,7 +376,7 @@ Expanding - + 20 16 @@ -401,7 +401,7 @@ Expanding - + 20 16 @@ -410,7 +410,7 @@ - layout10 + tqlayout10 @@ -474,7 +474,7 @@ Expanding - + 20 16 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::iterator it = m_children.begin(); it != m_children.end(); ++it) + for (TQValueList::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 children() const { return m_children; } + TQValueList tqchildren() const { return m_tqchildren; } Profile *parent() const { return m_parent; } void save(); @@ -81,7 +81,7 @@ protected: private: Profile *m_parent; - TQValueList m_children; + TQValueList 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 void walkProfiles(Operation &op, Profile *root) { - TQValueList children = root->children(); - for (TQValueList::iterator it = children.begin(); it != children.end(); ++it) + TQValueList tqchildren = root->tqchildren(); + for (TQValueList::iterator it = tqchildren.begin(); it != tqchildren.end(); ++it) { op(*it); walkProfiles(op, *it); @@ -244,8 +244,8 @@ public: template void walkProfiles(Operation &op, Result *result, Profile *root) { - TQValueList children = root->children(); - for (TQValueList::iterator it = children.begin(); it != children.end(); ++it) + TQValueList tqchildren = root->tqchildren(); + for (TQValueList::iterator it = tqchildren.begin(); it != tqchildren.end(); ++it) { Result *newResult = op(result, *it); walkProfiles(op, newResult, *it); -- cgit v1.2.1