summaryrefslogtreecommitdiffstats
path: root/src/common/nokde
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:33:27 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:33:27 -0600
commit9d6927a7d6a543332f828bffedf65eecf6774c6d (patch)
tree9f8210096908fddb7d266b477152021c45fa1a00 /src/common/nokde
parent3534213800bd8d151759df307755f2bbd592dfa1 (diff)
downloadpiklab-9d6927a7d6a543332f828bffedf65eecf6774c6d.tar.gz
piklab-9d6927a7d6a543332f828bffedf65eecf6774c6d.zip
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'src/common/nokde')
-rw-r--r--src/common/nokde/nokde_kaboutdata.cpp10
-rw-r--r--src/common/nokde/nokde_kcmdlineargs.cpp60
2 files changed, 35 insertions, 35 deletions
diff --git a/src/common/nokde/nokde_kaboutdata.cpp b/src/common/nokde/nokde_kaboutdata.cpp
index 6dd8f33..baa986c 100644
--- a/src/common/nokde/nokde_kaboutdata.cpp
+++ b/src/common/nokde/nokde_kaboutdata.cpp
@@ -25,7 +25,7 @@
#include "nokde_kaboutdata.h"
//#include <kstandarddirs.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqstringlist.h>
TQString
@@ -271,7 +271,7 @@ KAboutData::setProgramLogo(const TQImage& image)
TQString
KAboutData::version() const
{
- return TQString::tqfromLatin1(mVersion);
+ return TQString::fromLatin1(mVersion);
}
TQString
@@ -286,13 +286,13 @@ KAboutData::shortDescription() const
TQString
KAboutData::homepage() const
{
- return TQString::tqfromLatin1(mHomepageAddress);
+ return TQString::fromLatin1(mHomepageAddress);
}
TQString
KAboutData::bugAddress() const
{
- return TQString::tqfromLatin1(mBugEmailAddress);
+ return TQString::fromLatin1(mBugEmailAddress);
}
const TQValueList<KAboutPerson>
@@ -434,7 +434,7 @@ KAboutData::license() const
}
if (!l.isEmpty())
- result += i18n("This program is distributed under the terms of the %1.").tqarg( l );
+ result += i18n("This program is distributed under the terms of the %1.").arg( l );
if (!f.isEmpty())
{
diff --git a/src/common/nokde/nokde_kcmdlineargs.cpp b/src/common/nokde/nokde_kcmdlineargs.cpp
index 2191049..42dc5c1 100644
--- a/src/common/nokde/nokde_kcmdlineargs.cpp
+++ b/src/common/nokde/nokde_kcmdlineargs.cpp
@@ -518,7 +518,7 @@ KCmdLineArgs::findOption(const char *_opt, TQCString opt, int &i, bool _enabled,
if (ignoreUnknown)
return;
enable_i18n();
- usage( i18n("Unknown option '%1'.").tqarg(TQString::fromLocal8Bit(_opt)));
+ usage( i18n("Unknown option '%1'.").arg(TQString::fromLocal8Bit(_opt)));
}
if ((result & 4) != 0)
@@ -534,7 +534,7 @@ KCmdLineArgs::findOption(const char *_opt, TQCString opt, int &i, bool _enabled,
if (ignoreUnknown)
return;
enable_i18n();
- usage( i18n("Unknown option '%1'.").tqarg(TQString::fromLocal8Bit(_opt)));
+ usage( i18n("Unknown option '%1'.").arg(TQString::fromLocal8Bit(_opt)));
}
if (argument.isEmpty())
{
@@ -542,7 +542,7 @@ KCmdLineArgs::findOption(const char *_opt, TQCString opt, int &i, bool _enabled,
if (i >= argc)
{
enable_i18n();
- usage( i18n("'%1' missing.").tqarg( opt_name));
+ usage( i18n("'%1' missing.").arg( opt_name));
}
argument = argv[i];
}
@@ -618,10 +618,10 @@ KCmdLineArgs::parseAllArgs()
else if ( (::qstrcmp(option, "version") == 0) ||
(::qstrcmp(option, "v") == 0))
{
- printQ( TQString("TQt: %1\n").tqarg(qVersion()));
-// printQ( TQString("KDE: %1\n").tqarg(TDE_VERSION_STRING));
+ printQ( TQString("TQt: %1\n").arg(qVersion()));
+// printQ( TQString("KDE: %1\n").arg(TDE_VERSION_STRING));
printQ( TQString("%1: %2\n").
- arg(about->programName()).tqarg(about->version()));
+ arg(about->programName()).arg(about->version()));
exit(0);
} else if ( (::qstrcmp(option, "license") == 0) )
{
@@ -641,17 +641,17 @@ KCmdLineArgs::parseAllArgs()
email = " <" + (*it).emailAddress() + ">";
authorlist += TQString(" ") + (*it).name() + email + "\n";
}
- printQ( i18n("the 2nd argument is a list of name+address, one on each line","%1 was written by\n%2").arg ( TQString(about->programName()) ).tqarg( authorlist ) );
+ printQ( i18n("the 2nd argument is a list of name+address, one on each line","%1 was written by\n%2").arg ( TQString(about->programName()) ).arg( authorlist ) );
}
} else {
- printQ( i18n("%1 was written by somebody who wants to remain anonymous.").tqarg(about->programName()) );
+ printQ( i18n("%1 was written by somebody who wants to remain anonymous.").arg(about->programName()) );
}
if (!about->bugAddress().isEmpty())
{
if (about->bugAddress() == "submit@bugs.kde.org")
printQ( i18n( "Please use http://bugs.kde.org to report bugs, do not mail the authors directly.\n" ) );
else
- printQ( i18n( "Please use %1 to report bugs, do not mail the authors directly.\n" ).tqarg(about->bugAddress()) );
+ printQ( i18n( "Please use %1 to report bugs, do not mail the authors directly.\n" ).arg(about->bugAddress()) );
}
exit(0);
} else {
@@ -671,7 +671,7 @@ KCmdLineArgs::parseAllArgs()
if (ignoreUnknown)
continue;
enable_i18n();
- usage( i18n("Unexpected argument '%1'.").tqarg(TQString::fromLocal8Bit(argv[i])));
+ usage( i18n("Unexpected argument '%1'.").arg(TQString::fromLocal8Bit(argv[i])));
}
else
{
@@ -815,7 +815,7 @@ KCmdLineArgs::usage(const char *id)
{
if (args->name)
{
- usage = i18n("[%1-options]").tqarg(args->name)+" "+usage;
+ usage = i18n("[%1-options]").arg(args->name)+" "+usage;
}
args = argsList->prev();
}
@@ -835,30 +835,30 @@ KCmdLineArgs::usage(const char *id)
}
}
- printQ(i18n("Usage: %1 %2\n").tqarg(argv[0]).tqarg(usage));
+ printQ(i18n("Usage: %1 %2\n").arg(argv[0]).arg(usage));
printQ("\n"+about->shortDescription()+"\n");
- printQ(optionHeaderString.tqarg(i18n("Generic options")));
- printQ(optionFormatString.tqarg("--help", -25).tqarg(i18n("Show help about options")));
+ printQ(optionHeaderString.arg(i18n("Generic options")));
+ printQ(optionFormatString.arg("--help", -25).arg(i18n("Show help about options")));
args = argsList->first();
while(args)
{
if (args->name && args->id)
{
- TQString option = TQString("--help-%1").tqarg(args->id);
- TQString desc = i18n("Show %1 specific options").tqarg(args->name);
+ TQString option = TQString("--help-%1").arg(args->id);
+ TQString desc = i18n("Show %1 specific options").arg(args->name);
- printQ(optionFormatString.tqarg(option, -25).tqarg(desc));
+ printQ(optionFormatString.arg(option, -25).arg(desc));
}
args = argsList->next();
}
- printQ(optionFormatString.tqarg("--help-all",-25).tqarg(i18n("Show all options")));
- printQ(optionFormatString.tqarg("--author",-25).tqarg(i18n("Show author information")));
- printQ(optionFormatString.tqarg("-v, --version",-25).tqarg(i18n("Show version information")));
- printQ(optionFormatString.tqarg("--license",-25).tqarg(i18n("Show license information")));
- printQ(optionFormatString.tqarg("--", -25).tqarg(i18n("End of options")));
+ printQ(optionFormatString.arg("--help-all",-25).arg(i18n("Show all options")));
+ printQ(optionFormatString.arg("--author",-25).arg(i18n("Show author information")));
+ printQ(optionFormatString.arg("-v, --version",-25).arg(i18n("Show version information")));
+ printQ(optionFormatString.arg("--license",-25).arg(i18n("Show license information")));
+ printQ(optionFormatString.arg("--", -25).arg(i18n("End of options")));
args = argsList->first(); // Sets current to 1st.
@@ -880,7 +880,7 @@ KCmdLineArgs::usage(const char *id)
bool hasOptions = false;
TQString optionsHeader;
if (args->name)
- optionsHeader = optionHeaderString.tqarg(i18n("%1 options").tqarg(TQString::tqfromLatin1(args->name)));
+ optionsHeader = optionHeaderString.arg(i18n("%1 options").arg(TQString::fromLatin1(args->name)));
else
optionsHeader = i18n("\nOptions:\n");
@@ -950,8 +950,8 @@ KCmdLineArgs::usage(const char *id)
name = name.mid(1);
if ((name[0] == '[') && (name[name.length()-1] == ']'))
name = name.mid(1, name.length()-2);
- printQ(optionFormatString.tqarg(TQString(name), -25)
- .tqarg(description));
+ printQ(optionFormatString.arg(TQString(name), -25)
+ .arg(description));
}
else
{
@@ -974,13 +974,13 @@ KCmdLineArgs::usage(const char *id)
opt = opt + name;
if (!option->def)
{
- printQ(optionFormatString.tqarg(TQString(opt), -25)
- .tqarg(description));
+ printQ(optionFormatString.arg(TQString(opt), -25)
+ .arg(description));
}
else
{
- printQ(optionFormatStringDef.tqarg(TQString(opt), -25)
- .tqarg(description).tqarg(option->def));
+ printQ(optionFormatStringDef.arg(TQString(opt), -25)
+ .arg(description).arg(option->def));
}
opt = "";
}
@@ -989,7 +989,7 @@ KCmdLineArgs::usage(const char *id)
it != dl.end();
++it)
{
- printQ(optionFormatString.tqarg("", -25).tqarg(*it));
+ printQ(optionFormatString.arg("", -25).arg(*it));
}
option++;