diff options
author | Timothy Pearson <[email protected]> | 2011-12-15 15:48:49 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2011-12-15 15:48:49 -0600 |
commit | 13281e2856a2ef43bbab78c5528470309c23aa77 (patch) | |
tree | 936bcf8145dc235004c73e9fb3d6b3dca9aa370b /arts | |
parent | e81c741bb2cf337a43524e75f22f7728ce17a343 (diff) | |
download | tdelibs-13281e2856a2ef43bbab78c5528470309c23aa77.tar.gz tdelibs-13281e2856a2ef43bbab78c5528470309c23aa77.zip |
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'arts')
-rw-r--r-- | arts/kde/kartsserver.cpp | 6 | ||||
-rw-r--r-- | arts/kde/kioinputstream_impl.cpp | 2 | ||||
-rw-r--r-- | arts/kde/kplayobject.cc | 8 | ||||
-rw-r--r-- | arts/kde/kvideowidget.cpp | 2 | ||||
-rw-r--r-- | arts/knotify/knotify.cpp | 6 |
5 files changed, 12 insertions, 12 deletions
diff --git a/arts/kde/kartsserver.cpp b/arts/kde/kartsserver.cpp index 50e8b3a2a..e030cb411 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("tdeinit_wrapper"))).data(); + proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("tdeinit_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/kde/kvideowidget.cpp b/arts/kde/kvideowidget.cpp index 8ea6d4cf4..7199a55a6 100644 --- a/arts/kde/kvideowidget.cpp +++ b/arts/kde/kvideowidget.cpp @@ -147,7 +147,7 @@ void KVideoWidget::embed( Arts::VideoPlayObject vpo ) } setBackgroundMode( PaletteBackground ); - tqrepaint(); + repaint(); // Resize GUI videoWidth = 0; diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp index b8d5b8d26..047b3bf63 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 <tqtextstream.h> +#include <textstream.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::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; |