summaryrefslogtreecommitdiffstats
path: root/src/profileengine
diff options
context:
space:
mode:
Diffstat (limited to 'src/profileengine')
-rw-r--r--src/profileengine/editor/addprofilewidget.ui6
-rw-r--r--src/profileengine/editor/profileeditor.cpp12
-rw-r--r--src/profileengine/editor/profileeditorbase.ui22
-rw-r--r--src/profileengine/lib/profile.cpp6
-rw-r--r--src/profileengine/lib/profile.h4
-rw-r--r--src/profileengine/lib/profileengine.cpp30
-rw-r--r--src/profileengine/lib/profileengine.h8
7 files changed, 44 insertions, 44 deletions
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 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout6</cstring>
+ <cstring>tqlayout6</cstring>
</property>
<vbox>
<property name="name">
@@ -53,7 +53,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout7</cstring>
+ <cstring>tqlayout7</cstring>
</property>
<vbox>
<property name="name">
@@ -85,7 +85,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout8</cstring>
+ <cstring>tqlayout8</cstring>
</property>
<vbox>
<property name="name">
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 <layout.h>
+#include <tqlayout.h>
#include <klineedit.h>
-#include <textedit.h>
-#include <palette.h>
+#include <tqtextedit.h>
+#include <tqpalette.h>
#include <kdebug.h>
#include <kpushbutton.h>
@@ -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 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout11</cstring>
+ <cstring>tqlayout11</cstring>
</property>
<grid>
<property name="name">
@@ -73,7 +73,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>142</height>
@@ -192,7 +192,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="2" colspan="1">
<property name="name">
- <cstring>layout7</cstring>
+ <cstring>tqlayout7</cstring>
</property>
<vbox>
<property name="name">
@@ -221,7 +221,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="1" rowspan="1" colspan="3">
<property name="name">
- <cstring>layout8</cstring>
+ <cstring>tqlayout8</cstring>
</property>
<vbox>
<property name="name">
@@ -263,7 +263,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="2" rowspan="4" colspan="1">
<property name="name">
- <cstring>layout5</cstring>
+ <cstring>tqlayout5</cstring>
</property>
<vbox>
<property name="name">
@@ -303,7 +303,7 @@
</widget>
<widget class="TQLayoutWidget" row="4" column="2" rowspan="4" colspan="1">
<property name="name">
- <cstring>layout6</cstring>
+ <cstring>tqlayout6</cstring>
</property>
<vbox>
<property name="name">
@@ -359,7 +359,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -376,7 +376,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -401,7 +401,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -410,7 +410,7 @@
</spacer>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="8" colspan="1">
<property name="name">
- <cstring>layout10</cstring>
+ <cstring>tqlayout10</cstring>
</property>
<vbox>
<property name="name">
@@ -474,7 +474,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>16</height>
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);