summaryrefslogtreecommitdiffstats
path: root/kconf_update
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
commit10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch)
tree4bc444c00a79e88105f2cfce5b6209994c413ca0 /kconf_update
parent307136d8eef0ba133b78ceee8e901138d4c996a1 (diff)
downloadtdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.tar.gz
tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.zip
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
Diffstat (limited to 'kconf_update')
-rw-r--r--kconf_update/README.kconf_update8
-rw-r--r--kconf_update/kconf_update.cpp46
2 files changed, 27 insertions, 27 deletions
diff --git a/kconf_update/README.kconf_update b/kconf_update/README.kconf_update
index 63f0214c9..14d50ad66 100644
--- a/kconf_update/README.kconf_update
+++ b/kconf_update/README.kconf_update
@@ -28,7 +28,7 @@ How it works
Applications can install so called "update files" under
$KDEDIR/share/apps/kconf_update. An update file has ".upd" as extension and
-tqcontains instructions for transferring/converting configuration information
+contains instructions for transferring/converting configuration information
from one place to another.
Updating the configuration happens automatically, either when KDE gets started
@@ -39,7 +39,7 @@ section describing a configuration change has been applied, the Id will be
stored in the file "kconf_updaterc". This information is used to make sure
that a configuration update is only performed once.
-If you overwrite an existing update file with a new version that tqcontains a
+If you overwrite an existing update file with a new version that contains a
new section, only the update instructions from this extra section will be
performed.
@@ -77,7 +77,7 @@ adding lines with "# DELETE [group]key" in the output of the script.
To delete a whole group use "# DELETEGROUP [group]".
<script> should be installed into $(kde_datadir)/kconf_update, or
-kconf_update will not be able to tqfind it. It is not portable to install
+kconf_update will not be able to find it. It is not portable to install
binary applications in $kde_datadir, so you have to stick with interpreted
scripts like sh or perl scripts. From KDE 3.2 onwards it's also possible
to install kconf_update applications in $(kde_bindir)/kconf_update_bin,
@@ -85,7 +85,7 @@ which opens the door to kconf_update applications that are written in C++
and use Qt's powerful string API instead.
A workaround for KDE 3.1.x and older is to install a .sh script in
-$(kde_datadir) that tqcontains a simple exec:
+$(kde_datadir) that contains a simple exec:
exec "`kde-config --prefix`/bin/kconf_update_bin/my_update_app"
diff --git a/kconf_update/kconf_update.cpp b/kconf_update/kconf_update.cpp
index 57f63d013..a3a165ab8 100644
--- a/kconf_update/kconf_update.cpp
+++ b/kconf_update/kconf_update.cpp
@@ -51,7 +51,7 @@ class KonfUpdate
public:
KonfUpdate();
~KonfUpdate();
- TQStringList tqfindUpdateFiles(bool dirtyOnly);
+ TQStringList findUpdateFiles(bool dirtyOnly);
TQTextStream &log();
@@ -147,7 +147,7 @@ KonfUpdate::KonfUpdate()
{
if (config->readBoolEntry("autoUpdateDisabled", false))
return;
- updateFiles = tqfindUpdateFiles(true);
+ updateFiles = findUpdateFiles(true);
updateAll = true;
}
@@ -163,7 +163,7 @@ KonfUpdate::KonfUpdate()
if (updateAll && !config->readBoolEntry("updateInfoAdded", false))
{
config->writeEntry("updateInfoAdded", true);
- updateFiles = tqfindUpdateFiles(false);
+ updateFiles = findUpdateFiles(false);
for(TQStringList::ConstIterator it = updateFiles.begin();
it != updateFiles.end();
@@ -201,12 +201,12 @@ KonfUpdate::log()
}
}
- (*m_textStream) << TQDateTime::tqcurrentDateTime().toString( Qt::ISODate ) << " ";
+ (*m_textStream) << TQDateTime::currentDateTime().toString( Qt::ISODate ) << " ";
return *m_textStream;
}
-TQStringList KonfUpdate::tqfindUpdateFiles(bool dirtyOnly)
+TQStringList KonfUpdate::findUpdateFiles(bool dirtyOnly)
{
TQStringList result;
TQStringList list = KGlobal::dirs()->findAllResources("data", "kconf_update/*.upd", false, true);
@@ -218,7 +218,7 @@ TQStringList KonfUpdate::tqfindUpdateFiles(bool dirtyOnly)
struct stat buff;
if (stat( TQFile::encodeName(file), &buff) == 0)
{
- int i = file.tqfindRev('/');
+ int i = file.findRev('/');
if (i != -1)
file = file.mid(i+1);
config->setGroup(file);
@@ -237,7 +237,7 @@ TQStringList KonfUpdate::tqfindUpdateFiles(bool dirtyOnly)
bool KonfUpdate::checkFile(const TQString &filename)
{
currentFilename = filename;
- int i = currentFilename.tqfindRev('/');
+ int i = currentFilename.findRev('/');
if (i != -1)
currentFilename = currentFilename.mid(i+1);
skip = true;
@@ -268,7 +268,7 @@ bool KonfUpdate::checkFile(const TQString &filename)
void KonfUpdate::checkGotFile(const TQString &_file, const TQString &id)
{
TQString file;
- int i = _file.tqfind(',');
+ int i = _file.find(',');
if (i == -1)
{
file = _file.stripWhiteSpace();
@@ -283,7 +283,7 @@ void KonfUpdate::checkGotFile(const TQString &_file, const TQString &id)
KSimpleConfig cfg(file);
cfg.setGroup("$Version");
TQStringList ids = cfg.readListEntry("update_info");
- if (ids.tqcontains(id))
+ if (ids.contains(id))
return;
ids.append(id);
cfg.writeEntry("update_info", ids);
@@ -311,7 +311,7 @@ void KonfUpdate::checkGotFile(const TQString &_file, const TQString &id)
bool KonfUpdate::updateFile(const TQString &filename)
{
currentFilename = filename;
- int i = currentFilename.tqfindRev('/');
+ int i = currentFilename.findRev('/');
if (i != -1)
currentFilename = currentFilename.mid(i+1);
skip = true;
@@ -398,7 +398,7 @@ void KonfUpdate::gotId(const TQString &_id)
{
config->setGroup(currentFilename);
TQStringList ids = config->readListEntry("done");
- if (!ids.tqcontains(id))
+ if (!ids.contains(id))
{
ids.append(id);
config->writeEntry("done", ids);
@@ -413,7 +413,7 @@ void KonfUpdate::gotId(const TQString &_id)
TQStringList ids = config->readListEntry("done");
if (!_id.isEmpty())
{
- if (ids.tqcontains(_id))
+ if (ids.contains(_id))
{
//qDebug("Id '%s' was already in done-list", _id.latin1());
if (!m_bUseConfigInfo)
@@ -445,7 +445,7 @@ void KonfUpdate::gotFile(const TQString &_file)
oldConfig2->setGroup("$Version");
TQStringList ids = oldConfig2->readListEntry("update_info");
TQString cfg_id = currentFilename + ":" + id;
- if (!ids.tqcontains(cfg_id) && !skip)
+ if (!ids.contains(cfg_id) && !skip)
{
ids.append(cfg_id);
oldConfig2->writeEntry("update_info", ids);
@@ -473,7 +473,7 @@ void KonfUpdate::gotFile(const TQString &_file)
newConfig->setGroup("$Version");
TQStringList ids = newConfig->readListEntry("update_info");
TQString cfg_id = currentFilename + ":" + id;
- if (!ids.tqcontains(cfg_id) && !skip)
+ if (!ids.contains(cfg_id) && !skip)
{
ids.append(cfg_id);
newConfig->writeEntry("update_info", ids);
@@ -486,7 +486,7 @@ void KonfUpdate::gotFile(const TQString &_file)
}
newConfig = 0;
- int i = _file.tqfind(',');
+ int i = _file.find(',');
if (i == -1)
{
oldFile = _file.stripWhiteSpace();
@@ -505,7 +505,7 @@ void KonfUpdate::gotFile(const TQString &_file)
TQString cfg_id = currentFilename + ":" + id;
oldConfig2->setGroup("$Version");
TQStringList ids = oldConfig2->readListEntry("update_info");
- if (ids.tqcontains(cfg_id))
+ if (ids.contains(cfg_id))
{
skip = true;
newFile = TQString::null;
@@ -517,7 +517,7 @@ void KonfUpdate::gotFile(const TQString &_file)
newConfig = new KConfig(newFile, false, false);
newConfig->setGroup("$Version");
ids = newConfig->readListEntry("update_info");
- if (ids.tqcontains(cfg_id))
+ if (ids.contains(cfg_id))
{
skip = true;
log() << currentFilename << ": Skipping update '" << id << "'" << endl;
@@ -541,7 +541,7 @@ void KonfUpdate::gotFile(const TQString &_file)
void KonfUpdate::gotGroup(const TQString &_group)
{
- int i = _group.tqfind(',');
+ int i = _group.find(',');
if (i == -1)
{
oldGroup = _group.stripWhiteSpace();
@@ -574,7 +574,7 @@ void KonfUpdate::gotRemoveGroup(const TQString &_group)
void KonfUpdate::gotKey(const TQString &_key)
{
- int i = _key.tqfind(',');
+ int i = _key.find(',');
if (i == -1)
{
oldKey = _key.stripWhiteSpace();
@@ -724,7 +724,7 @@ void KonfUpdate::gotScriptArguments(const TQString &_arguments)
void KonfUpdate::gotScript(const TQString &_script)
{
TQString script, interpreter;
- int i = _script.tqfind(',');
+ int i = _script.find(',');
if (i == -1)
{
script = _script.stripWhiteSpace();
@@ -860,7 +860,7 @@ void KonfUpdate::gotScript(const TQString &_script)
TQString line = ts.readLine();
if (line.startsWith("["))
{
- int j = line.tqfind(']')+1;
+ int j = line.find(']')+1;
if (j > 0)
group = line.mid(1, j-2);
}
@@ -869,7 +869,7 @@ void KonfUpdate::gotScript(const TQString &_script)
TQString key = line.mid(9);
if (key[0] == '[')
{
- int j = key.tqfind(']')+1;
+ int j = key.find(']')+1;
if (j > 0)
{
group = key.mid(1,j-2);
@@ -888,7 +888,7 @@ void KonfUpdate::gotScript(const TQString &_script)
TQString key = line.mid(13).stripWhiteSpace();
if (key[0] == '[')
{
- int j = key.tqfind(']')+1;
+ int j = key.find(']')+1;
if (j > 0)
{
group = key.mid(1,j-2);