summaryrefslogtreecommitdiffstats
path: root/arts
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2011-12-16 09:59:13 -0600
committerTimothy Pearson <[email protected]>2011-12-16 09:59:13 -0600
commit56160bf4dfe503631ef6373367b281f081bab2b4 (patch)
tree7fcea2ffd9c3420af999c3dcad0ed032eef93956 /arts
parent13281e2856a2ef43bbab78c5528470309c23aa77 (diff)
downloadtdelibs-56160bf4dfe503631ef6373367b281f081bab2b4.tar.gz
tdelibs-56160bf4dfe503631ef6373367b281f081bab2b4.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 13281e2856a2ef43bbab78c5528470309c23aa77.
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/kde/kvideowidget.cpp2
-rw-r--r--arts/knotify/knotify.cpp6
5 files changed, 12 insertions, 12 deletions
diff --git a/arts/kde/kartsserver.cpp b/arts/kde/kartsserver.cpp
index e030cb411..50e8b3a2a 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::fromLatin1("tdeinit_wrapper"))).data();
+ proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("tdeinit_wrapper"))).data();
if(rt)
- proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("artswrapper"))).data();
+ proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("artswrapper"))).data();
else
- proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("artsd"))).data();
+ proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("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 8c131bfd1..15994625e 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::fromLatin1("aRts/") + TQString::fromLatin1(ARTS_VERSION));
+ m_job->addMetaData("UserAgent", TQString::tqfromLatin1("aRts/") + TQString::tqfromLatin1(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 becb20a58..7c71be31f 100644
--- a/arts/kde/kplayobject.cc
+++ b/arts/kde/kplayobject.cc
@@ -65,7 +65,7 @@ void KPlayObject::halt()
TQString KPlayObject::description()
{
- return TQString::fromLatin1(object().description().c_str());
+ return TQString::tqfromLatin1(object().description().c_str());
}
Arts::poTime KPlayObject::currentTime()
@@ -85,7 +85,7 @@ Arts::poCapabilities KPlayObject::capabilities()
TQString KPlayObject::mediaName()
{
- return TQString::fromLatin1(object().mediaName().c_str());
+ return TQString::tqfromLatin1(object().mediaName().c_str());
}
Arts::poState KPlayObject::state()
@@ -243,7 +243,7 @@ TQString KDE::PlayObject::description()
{
if ( object().isNull() )
return TQString();
- return TQString::fromLatin1(object().description().c_str());
+ return TQString::tqfromLatin1(object().description().c_str());
}
Arts::poTime KDE::PlayObject::currentTime()
@@ -271,7 +271,7 @@ TQString KDE::PlayObject::mediaName()
{
if ( object().isNull() )
return TQString();
- return TQString::fromLatin1(object().mediaName().c_str());
+ return TQString::tqfromLatin1(object().mediaName().c_str());
}
Arts::poState KDE::PlayObject::state()
diff --git a/arts/kde/kvideowidget.cpp b/arts/kde/kvideowidget.cpp
index 7199a55a6..8ea6d4cf4 100644
--- a/arts/kde/kvideowidget.cpp
+++ b/arts/kde/kvideowidget.cpp
@@ -147,7 +147,7 @@ void KVideoWidget::embed( Arts::VideoPlayObject vpo )
}
setBackgroundMode( PaletteBackground );
- repaint();
+ tqrepaint();
// Resize GUI
videoWidth = 0;
diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp
index 047b3bf63..b8d5b8d26 100644
--- a/arts/knotify/knotify.cpp
+++ b/arts/knotify/knotify.cpp
@@ -40,7 +40,7 @@
#include <tqfile.h>
#include <tqfileinfo.h>
#include <tqstringlist.h>
-#include <textstream.h>
+#include <tqtextstream.h>
// KDE headers
#include <dcopclient.h>
@@ -642,7 +642,7 @@ bool KNotify::notifyByLogfile(const TQString &text, const TQString &file)
// append msg
TQTextStream strm( &logFile );
- strm << "- KNotify " << TQDateTime::currentDateTime().toString() << ": ";
+ strm << "- KNotify " << TQDateTime::tqcurrentDateTime().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::currentDateTime().toString() << ": ";
+ strm << "KNotify " << TQDateTime::tqcurrentDateTime().toString() << ": ";
strm << text << endl;
return true;