summaryrefslogtreecommitdiffstats
path: root/arts
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-18 18:32:40 -0600
committerSlávek Banko <slavek.banko@axis.cz>2012-06-02 19:04:52 +0200
commite2867c1f1eec514d56386f2fc5350eaaf760532a (patch)
tree4803ad36a38c00b3ff22af6763e86d92a60629ee /arts
parent4418657ced76d97d20c3a4aeb79fefccdbd6ad7b (diff)
downloadtdelibs-e2867c1f1eec514d56386f2fc5350eaaf760532a.tar.gz
tdelibs-e2867c1f1eec514d56386f2fc5350eaaf760532a.zip
Rename old tq methods that no longer need a unique name
(cherry picked from commit 984c25aa6969e55896e9a13c8e7f7b8a58991a4e)
Diffstat (limited to 'arts')
-rw-r--r--arts/kde/kartsserver.cpp6
-rw-r--r--arts/kde/kioinputstream_impl.cpp2
-rw-r--r--arts/kde/kplayobject.cc8
-rw-r--r--arts/knotify/knotify.cpp4
4 files changed, 10 insertions, 10 deletions
diff --git a/arts/kde/kartsserver.cpp b/arts/kde/kartsserver.cpp
index a1b75e2f5..3f98a51b3 100644
--- a/arts/kde/kartsserver.cpp
+++ b/arts/kde/kartsserver.cpp
@@ -77,12 +77,12 @@ Arts::SoundServerV2 KArtsServer::server(void)
X11CommConfig.sync();
- proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("kdeinit_wrapper"))).data();
+ proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("kdeinit_wrapper"))).data();
if(rt)
- proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("artswrapper"))).data();
+ proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("artswrapper"))).data();
else
- proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("artsd"))).data();
+ proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("artsd"))).data();
proc << TQStringList::split( " ", config.readEntry( "Arguments", "-F 10 -S 4096 -s 60 -m artsmessage -l 3 -f" ) );
diff --git a/arts/kde/kioinputstream_impl.cpp b/arts/kde/kioinputstream_impl.cpp
index 15994625e..8c131bfd1 100644
--- a/arts/kde/kioinputstream_impl.cpp
+++ b/arts/kde/kioinputstream_impl.cpp
@@ -78,7 +78,7 @@ void KIOInputStream_impl::streamStart()
m_job = KIO::get(m_url, false, false);
m_job->addMetaData("accept", "audio/x-mp3, video/mpeg, application/ogg");
- m_job->addMetaData("UserAgent", TQString::tqfromLatin1("aRts/") + TQString::tqfromLatin1(ARTS_VERSION));
+ m_job->addMetaData("UserAgent", TQString::fromLatin1("aRts/") + TQString::fromLatin1(ARTS_VERSION));
TQObject::connect(m_job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));
diff --git a/arts/kde/kplayobject.cc b/arts/kde/kplayobject.cc
index 7c71be31f..becb20a58 100644
--- a/arts/kde/kplayobject.cc
+++ b/arts/kde/kplayobject.cc
@@ -65,7 +65,7 @@ void KPlayObject::halt()
TQString KPlayObject::description()
{
- return TQString::tqfromLatin1(object().description().c_str());
+ return TQString::fromLatin1(object().description().c_str());
}
Arts::poTime KPlayObject::currentTime()
@@ -85,7 +85,7 @@ Arts::poCapabilities KPlayObject::capabilities()
TQString KPlayObject::mediaName()
{
- return TQString::tqfromLatin1(object().mediaName().c_str());
+ return TQString::fromLatin1(object().mediaName().c_str());
}
Arts::poState KPlayObject::state()
@@ -243,7 +243,7 @@ TQString KDE::PlayObject::description()
{
if ( object().isNull() )
return TQString();
- return TQString::tqfromLatin1(object().description().c_str());
+ return TQString::fromLatin1(object().description().c_str());
}
Arts::poTime KDE::PlayObject::currentTime()
@@ -271,7 +271,7 @@ TQString KDE::PlayObject::mediaName()
{
if ( object().isNull() )
return TQString();
- return TQString::tqfromLatin1(object().mediaName().c_str());
+ return TQString::fromLatin1(object().mediaName().c_str());
}
Arts::poState KDE::PlayObject::state()
diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp
index c080ba30b..69bad49bc 100644
--- a/arts/knotify/knotify.cpp
+++ b/arts/knotify/knotify.cpp
@@ -642,7 +642,7 @@ bool KNotify::notifyByLogfile(const TQString &text, const TQString &file)
// append msg
TQTextStream strm( &logFile );
- strm << "- KNotify " << TQDateTime::tqcurrentDateTime().toString() << ": ";
+ strm << "- KNotify " << TQDateTime::currentDateTime().toString() << ": ";
strm << text << endl;
// close file
@@ -660,7 +660,7 @@ bool KNotify::notifyByStderr(const TQString &text)
TQTextStream strm( stderr, IO_WriteOnly );
// output msg
- strm << "KNotify " << TQDateTime::tqcurrentDateTime().toString() << ": ";
+ strm << "KNotify " << TQDateTime::currentDateTime().toString() << ": ";
strm << text << endl;
return true;