diff options
Diffstat (limited to 'arts')
47 files changed, 149 insertions, 338 deletions
diff --git a/arts/kde/CMakeLists.txt b/arts/kde/CMakeLists.txt index 091be3526..211a76924 100644 --- a/arts/kde/CMakeLists.txt +++ b/arts/kde/CMakeLists.txt @@ -43,15 +43,15 @@ install( FILES set( target artskde ) set( ${target}_SRCS - artskde.cc kioinputstream_impl.cpp kplayobject.cc - kplayobjectfactory.cc kartsfloatwatch.cpp kartsdispatcher.cc + artskde.cpp kioinputstream_impl.cpp kplayobject.cpp + kplayobjectfactory.cpp kartsfloatwatch.cpp kartsdispatcher.cpp kaudiorecordstream.cpp kaudioplaystream.cpp kartsserver.cpp - kdatarequest_impl.cpp kaudioconverter.cc kvideowidget.cpp - kplayobjectcreator.cc kaudiomanagerplay.cpp + kdatarequest_impl.cpp kaudioconverter.cpp kvideowidget.cpp + kplayobjectcreator.cpp kaudiomanagerplay.cpp ) add_custom_command( - OUTPUT artskde.cc artskde.h + OUTPUT artskde.cpp artskde.h COMMAND ${ARTS_MCOPIDL_EXECUTABLE} -I${ARTS_INCLUDEDIR} ${CMAKE_CURRENT_SOURCE_DIR}/artskde.idl DEPENDS artskde.idl diff --git a/arts/kde/Makefile.am b/arts/kde/Makefile.am index 0a56cc56e..394b0a32a 100644 --- a/arts/kde/Makefile.am +++ b/arts/kde/Makefile.am @@ -2,11 +2,11 @@ INCLUDES = -I$(top_builddir)/arts/kde \ -I$(top_srcdir) -I$(includedir)/arts $(all_includes) lib_LTLIBRARIES = libartskde.la -libartskde_la_SOURCES = artskde.cc kioinputstream_impl.cpp kplayobject.cc \ - kplayobjectfactory.cc kartsfloatwatch.cpp kartsdispatcher.cc \ +libartskde_la_SOURCES = artskde.cpp kioinputstream_impl.cpp kplayobject.cpp \ + kplayobjectfactory.cpp kartsfloatwatch.cpp kartsdispatcher.cpp \ kaudiorecordstream.cpp kaudioplaystream.cpp \ - kartsserver.cpp kdatarequest_impl.cpp kaudioconverter.cc \ - kvideowidget.cpp kplayobjectcreator.cc \ + kartsserver.cpp kdatarequest_impl.cpp kaudioconverter.cpp \ + kvideowidget.cpp kplayobjectcreator.cpp \ kaudiomanagerplay.cpp libartskde_la_LIBADD = $(LIB_TDEIO) -lqtmcop -lsoundserver_idl -lartsflow_idl -lmcop $(LIB_TQT) $(LIB_TDECORE) -lkmedia2_idl -lartsflow $(LIB_TDEUI) $(LIB_X11) libartskde_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2 @@ -23,18 +23,16 @@ noinst_HEADERS = kplayobjectcreator.h kplayobjectfactory_p.h artskde.mcoptype: artskde.h artskde.mcopclass: artskde.h MCOPINC = -I$(srcdir) -artskde.cc artskde.h: $(top_srcdir)/arts/kde/artskde.idl $(MCOPIDL) +artskde.cpp artskde.h: $(top_srcdir)/arts/kde/artskde.idl $(MCOPIDL) $(MCOPIDL) -I$(includedir)/arts -t $(MCOPINC) $(top_srcdir)/arts/kde/artskde.idl -DISTCLEANFILES = artskde.cc artskde.h artskde.mcoptype artskde.mcopclass +DISTCLEANFILES = artskde.cpp artskde.h artskde.mcoptype artskde.mcopclass check_PROGRAMS = kiotest kiotestslow kconverttest -kiotest_SOURCES = kiotest.cc -kiotestslow_SOURCES = kiotestslow.cc -kconverttest_SOURCES = kconverttest.cc +kiotest_SOURCES = kiotest.cpp +kiotestslow_SOURCES = kiotestslow.cpp +kconverttest_SOURCES = kconverttest.cpp kiotest_LDADD = libartskde.la -lqtmcop -lkmedia2 -lsoundserver_idl kiotestslow_LDADD = $(kiotest_LDADD) kconverttest_LDADD = $(kiotest_LDADD) - -# vim: ts=8 noet diff --git a/arts/kde/README b/arts/kde/README index 2d34f08fd..8c3405e33 100644 --- a/arts/kde/README +++ b/arts/kde/README @@ -6,7 +6,7 @@ libartskde is a simple KDE->aRts wrapper that allows the developer to use KDE technology to access aRts. ie. no need to deal with std::string's anymore -etc.. you can just use QString's or KURL's +etc.. you can just use TQString's or KURL's to play sound 2. How to use it to play sounds? diff --git a/arts/kde/kartsdispatcher.cc b/arts/kde/kartsdispatcher.cpp index fa41502f8..fa41502f8 100644 --- a/arts/kde/kartsdispatcher.cc +++ b/arts/kde/kartsdispatcher.cpp diff --git a/arts/kde/kartsdispatcher.h b/arts/kde/kartsdispatcher.h index b25085a78..ad1afbed7 100644 --- a/arts/kde/kartsdispatcher.h +++ b/arts/kde/kartsdispatcher.h @@ -61,9 +61,9 @@ namespace Arts * } * \endcode */ -class KDE_EXPORT KArtsDispatcher : public TQObject +class TDE_EXPORT KArtsDispatcher : public TQObject { -Q_OBJECT +TQ_OBJECT public: /** * Constructor. diff --git a/arts/kde/kartsfloatwatch.h b/arts/kde/kartsfloatwatch.h index cc6671556..b8cb229f0 100644 --- a/arts/kde/kartsfloatwatch.h +++ b/arts/kde/kartsfloatwatch.h @@ -44,11 +44,11 @@ namespace Arts { class KFloatWatchProxy_impl; } * \code * StereoVolumeControl stereoVolumeControl = ...; * KArtsFloatWatch *w = new KArtsFloatWatch(stereoVolumeControl, "scaleFactor_changed", this); - * connect(w, TQT_SIGNAL(valueChanged(float)), this, TQT_SLOT(setValue(float))); + * connect(w, TQ_SIGNAL(valueChanged(float)), this, TQ_SLOT(setValue(float))); * \endcode */ class KArtsFloatWatch : public TQObject { - Q_OBJECT + TQ_OBJECT private: KArtsFloatWatchPrivate *d; friend class Arts::KFloatWatchProxy_impl; diff --git a/arts/kde/kartsserver.cpp b/arts/kde/kartsserver.cpp index add7a7595..d7ad91d65 100644 --- a/arts/kde/kartsserver.cpp +++ b/arts/kde/kartsserver.cpp @@ -19,9 +19,9 @@ // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <flowsystem.h> -#include <ksimpleconfig.h> -#include <kprocess.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdeprocess.h> +#include <tdestandarddirs.h> #include <tqdir.h> #include <tqfile.h> #include "kartsserver.h" @@ -68,7 +68,7 @@ Arts::SoundServerV2 KArtsServer::server(void) bool x11Comm = config.readBoolEntry("X11GlobalComm", false); // put the value of x11Comm into .mcoprc - KSimpleConfig X11CommConfig(TQDir::homeDirPath()+"/.mcoprc"); + TDESimpleConfig X11CommConfig(TQDir::homeDirPath()+"/.mcoprc"); if(x11Comm) X11CommConfig.writeEntry("GlobalComm", "Arts::X11GlobalComm"); @@ -106,6 +106,4 @@ Arts::SoundServerV2 KArtsServer::server(void) return d->server; } - -// vim: sw=4 ts=4 noet #include "kartsserver.moc" diff --git a/arts/kde/kartsserver.h b/arts/kde/kartsserver.h index c0c04e66d..a5346aa06 100644 --- a/arts/kde/kartsserver.h +++ b/arts/kde/kartsserver.h @@ -36,7 +36,7 @@ */ class KDE_ARTS_EXPORT KArtsServer : public TQObject { -Q_OBJECT +TQ_OBJECT public: /** diff --git a/arts/kde/kaudioconverter.cc b/arts/kde/kaudioconverter.cpp index 1eb8c20e5..e959851f9 100644 --- a/arts/kde/kaudioconverter.cc +++ b/arts/kde/kaudioconverter.cpp @@ -74,7 +74,7 @@ bool KAudioConverter::setup(int samplingRate) void KAudioConverter::slotMimeType(const TQString &mimeType) { m_mimeType = mimeType; - kapp->exit_loop(); + tdeApp->exit_loop(); } void KAudioConverter::requestPlayObject(const KURL &url) @@ -88,13 +88,13 @@ void KAudioConverter::requestPlayObject(const KURL &url) Arts::TDEIOInputStream_impl *inputStreamImpl = new Arts::TDEIOInputStream_impl(); inputStream = Arts::TDEIOInputStream::_from_base(inputStreamImpl); - TQObject::connect(inputStreamImpl, TQT_SIGNAL(mimeTypeFound(const TQString &)), TQT_SLOT(slotMimeType(const TQString &))); + TQObject::connect(inputStreamImpl, TQ_SIGNAL(mimeTypeFound(const TQString &)), TQ_SLOT(slotMimeType(const TQString &))); inputStream.openURL(url.url().latin1()); inputStream.streamStart(); // ugly hacks.. :/ - kapp->enter_loop(); + tdeApp->enter_loop(); queryInterface = "Arts::StreamPlayObject"; } @@ -161,9 +161,9 @@ void KAudioConverter::start() Arts::connect(m_incoming->object(), "left", m_request, "left"); Arts::connect(m_incoming->object(), "right", m_request, "right"); - TQObject::connect(requestImpl, TQT_SIGNAL(newBlockSize(long)), TQT_SIGNAL(newBlockSize(long))); - TQObject::connect(requestImpl, TQT_SIGNAL(newBlockPointer(long)), TQT_SIGNAL(newBlockPointer(long))); - TQObject::connect(requestImpl, TQT_SIGNAL(newData()), TQT_SIGNAL(newData())); + TQObject::connect(requestImpl, TQ_SIGNAL(newBlockSize(long)), TQ_SIGNAL(newBlockSize(long))); + TQObject::connect(requestImpl, TQ_SIGNAL(newBlockPointer(long)), TQ_SIGNAL(newBlockPointer(long))); + TQObject::connect(requestImpl, TQ_SIGNAL(newData()), TQ_SIGNAL(newData())); // Special mpeglib case // TODO: needed at all?? diff --git a/arts/kde/kaudioconverter.h b/arts/kde/kaudioconverter.h index 0022d9bba..773018021 100644 --- a/arts/kde/kaudioconverter.h +++ b/arts/kde/kaudioconverter.h @@ -31,7 +31,7 @@ class TQString; class KAudioConverter : public TQObject { -Q_OBJECT +TQ_OBJECT public: KAudioConverter(); ~KAudioConverter(); diff --git a/arts/kde/kaudiomanagerplay.cpp b/arts/kde/kaudiomanagerplay.cpp index 0496536d2..b8c03e3a6 100644 --- a/arts/kde/kaudiomanagerplay.cpp +++ b/arts/kde/kaudiomanagerplay.cpp @@ -86,5 +86,3 @@ void KAudioManagerPlay::stop() d->started = false; d->amanPlay.stop(); } - -// vim: sw=4 ts=4 diff --git a/arts/kde/kaudiomanagerplay.h b/arts/kde/kaudiomanagerplay.h index 814cdf320..5642eaa3c 100644 --- a/arts/kde/kaudiomanagerplay.h +++ b/arts/kde/kaudiomanagerplay.h @@ -80,5 +80,3 @@ class KDE_ARTS_EXPORT KAudioManagerPlay #endif // KAUDIOMANAGERPLAY_H - -// vim: sw=4 ts=4 diff --git a/arts/kde/kaudioplaystream.cpp b/arts/kde/kaudioplaystream.cpp index 0ef5b8332..5f0229a4b 100644 --- a/arts/kde/kaudioplaystream.cpp +++ b/arts/kde/kaudioplaystream.cpp @@ -203,8 +203,5 @@ void KByteSoundProducer::request_outdata( Arts::DataPacket<Arts::mcopbyte> *pack packet->send(); } } - -// vim: sw=4 ts=4 tw=80 - #include "kaudioplaystream.moc" #include "kaudioplaystream_p.moc" diff --git a/arts/kde/kaudioplaystream.h b/arts/kde/kaudioplaystream.h index 8c600c049..106112b6a 100644 --- a/arts/kde/kaudioplaystream.h +++ b/arts/kde/kaudioplaystream.h @@ -40,7 +40,7 @@ class KAudioPlayStreamPrivate; */ class KDE_ARTS_EXPORT KAudioPlayStream : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** * Creates a KAudioPlayStream on server with a title. You should pass the KArtsServer also @@ -123,5 +123,3 @@ private: }; #endif // KAUDIOPLAYSTREAM_H - -// vim: sw=4 ts=4 tw=80 diff --git a/arts/kde/kaudioplaystream_p.h b/arts/kde/kaudioplaystream_p.h index 4e4f25ed1..93cb92429 100644 --- a/arts/kde/kaudioplaystream_p.h +++ b/arts/kde/kaudioplaystream_p.h @@ -37,7 +37,7 @@ class KAudioPlayStream; class KByteSoundProducer; class KAudioPlayStreamPrivate : public TQObject { - Q_OBJECT + TQ_OBJECT public: KAudioPlayStreamPrivate( KArtsServer*, const TQString title, TQObject*, const char* =0 ); ~KAudioPlayStreamPrivate(); @@ -80,5 +80,3 @@ private: }; #endif // KAUDIOPLAYSTREAM_P_H - -// vim: sw=4 ts=4 diff --git a/arts/kde/kaudiorecordstream.cpp b/arts/kde/kaudiorecordstream.cpp index 0c11bcf04..02c88411a 100644 --- a/arts/kde/kaudiorecordstream.cpp +++ b/arts/kde/kaudiorecordstream.cpp @@ -66,7 +66,7 @@ KAudioRecordStream::KAudioRecordStream( KArtsServer * kserver, const TQString & d->inqueue.setAutoDelete( true ); d->title = title; - connect( d->kserver, TQT_SIGNAL( restartedServer() ), TQT_SLOT( slotRestartedServer() ) ); + connect( d->kserver, TQ_SIGNAL( restartedServer() ), TQ_SLOT( slotRestartedServer() ) ); d->in = Arts::DynamicCast( d->kserver->server().createObject( "Arts::Synth_AMAN_RECORD" ) ); d->effectStack = Arts::DynamicCast( d->kserver->server().createObject( "Arts::StereoEffectStack" ) ); @@ -196,8 +196,8 @@ void KAudioRecordStream::start( int samplingRate, int bits, int channels ) d->receiver_base = new KByteSoundReceiver( samplingRate, bits, channels, d->title.local8Bit() ); d->receiver = Arts::ByteSoundReceiver::_from_base( d->receiver_base ); - connect( d->receiver_base, TQT_SIGNAL( data( const char *, unsigned int ) ), - TQT_SLOT( slotData( const char *, unsigned int ) ) ); + connect( d->receiver_base, TQ_SIGNAL( data( const char *, unsigned int ) ), + TQ_SLOT( slotData( const char *, unsigned int ) ) ); Arts::connect( d->convert, "outdata", d->receiver, "indata" ); d->convert.start(); @@ -262,8 +262,5 @@ void KByteSoundReceiver::process_indata( Arts::DataPacket<Arts::mcopbyte> * inpa emit data( (char *)inpacket->contents, inpacket->size ); inpacket->processed(); } - -// vim:sw=4:ts=4 - #include "kaudiorecordstream.moc" #include "kaudiorecordstream_p.moc" diff --git a/arts/kde/kaudiorecordstream.h b/arts/kde/kaudiorecordstream.h index bbdb6d736..a1e4f1931 100644 --- a/arts/kde/kaudiorecordstream.h +++ b/arts/kde/kaudiorecordstream.h @@ -40,7 +40,7 @@ namespace Arts { class StereoEffectStack; } */ class KDE_ARTS_EXPORT KAudioRecordStream : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/arts/kde/kaudiorecordstream_p.h b/arts/kde/kaudiorecordstream_p.h index 1d38b2278..727f384ec 100644 --- a/arts/kde/kaudiorecordstream_p.h +++ b/arts/kde/kaudiorecordstream_p.h @@ -32,7 +32,7 @@ class KByteSoundReceiver : public TQObject, public Arts::ByteSoundReceiver_skel, public Arts::StdSynthModule { - Q_OBJECT + TQ_OBJECT public: KByteSoundReceiver( int rate, int bits, int channels, const char * title ); diff --git a/arts/kde/kconverttest.cc b/arts/kde/kconverttest.cpp index 647c2f320..6c5706122 100644 --- a/arts/kde/kconverttest.cc +++ b/arts/kde/kconverttest.cpp @@ -81,13 +81,13 @@ int main(int argc, char **argv) // converter.setup(44100); converter.requestPlayObject(url); - TQObject::connect(&converter, TQT_SIGNAL(rawStreamStart()), get, TQT_SLOT(slotRawStreamStart())); + TQObject::connect(&converter, TQ_SIGNAL(rawStreamStart()), get, TQ_SLOT(slotRawStreamStart())); - TQObject::connect(&converter, TQT_SIGNAL(newBlockSize(long)), get, TQT_SLOT(slotNewBlockSize(long))); - TQObject::connect(&converter, TQT_SIGNAL(newBlockPointer(long)), get, TQT_SLOT(slotNewBlockPointer(long))); - TQObject::connect(&converter, TQT_SIGNAL(newData()), get, TQT_SLOT(slotNewData())); + TQObject::connect(&converter, TQ_SIGNAL(newBlockSize(long)), get, TQ_SLOT(slotNewBlockSize(long))); + TQObject::connect(&converter, TQ_SIGNAL(newBlockPointer(long)), get, TQ_SLOT(slotNewBlockPointer(long))); + TQObject::connect(&converter, TQ_SIGNAL(newData()), get, TQ_SLOT(slotNewData())); - TQObject::connect(&converter, TQT_SIGNAL(rawStreamFinished()), get, TQT_SLOT(slotRawStreamFinished())); + TQObject::connect(&converter, TQ_SIGNAL(rawStreamFinished()), get, TQ_SLOT(slotRawStreamFinished())); converter.start(); diff --git a/arts/kde/kconverttest.h b/arts/kde/kconverttest.h index 7e7cc6c50..f74b62859 100644 --- a/arts/kde/kconverttest.h +++ b/arts/kde/kconverttest.h @@ -26,7 +26,7 @@ class KConvertTest : public TQObject { -Q_OBJECT +TQ_OBJECT public: KConvertTest(); diff --git a/arts/kde/kdatarequest_impl.h b/arts/kde/kdatarequest_impl.h index 7d90c8b73..4abe72c03 100644 --- a/arts/kde/kdatarequest_impl.h +++ b/arts/kde/kdatarequest_impl.h @@ -32,7 +32,7 @@ namespace Arts class KDataRequest_impl : public TQObject, virtual public KDataRequest_skel, virtual public StdSynthModule { -Q_OBJECT +TQ_OBJECT public: KDataRequest_impl(); ~KDataRequest_impl(); diff --git a/arts/kde/kioinputstream_impl.cpp b/arts/kde/kioinputstream_impl.cpp index d893675cd..38acef54d 100644 --- a/arts/kde/kioinputstream_impl.cpp +++ b/arts/kde/kioinputstream_impl.cpp @@ -80,14 +80,14 @@ void TDEIOInputStream_impl::streamStart() m_job->addMetaData("accept", "audio/x-mp3, video/mpeg, application/ogg"); m_job->addMetaData("UserAgent", TQString::fromLatin1("aRts/") + TQString::fromLatin1(ARTS_VERSION)); - TQObject::connect(m_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); - TQObject::connect(m_job, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotResult(TDEIO::Job *))); - TQObject::connect(m_job, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)), - this, TQT_SLOT(slotScanMimeType(TDEIO::Job *, const TQString &))); - TQObject::connect(m_job, TQT_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t)), - this, TQT_SLOT(slotTotalSize(TDEIO::Job *, TDEIO::filesize_t))); + TQObject::connect(m_job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + TQObject::connect(m_job, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotResult(TDEIO::Job *))); + TQObject::connect(m_job, TQ_SIGNAL(mimetype(TDEIO::Job *, const TQString &)), + this, TQ_SLOT(slotScanMimeType(TDEIO::Job *, const TQString &))); + TQObject::connect(m_job, TQ_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t)), + this, TQ_SLOT(slotTotalSize(TDEIO::Job *, TDEIO::filesize_t))); m_streamStarted = true; } @@ -98,14 +98,14 @@ void TDEIOInputStream_impl::streamEnd() if(m_job != 0) { - TQObject::disconnect(m_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); - TQObject::disconnect(m_job, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotResult(TDEIO::Job *))); - TQObject::disconnect(m_job, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)), - this, TQT_SLOT(slotScanMimeType(TDEIO::Job *, const TQString &))); - TQObject::disconnect(m_job, TQT_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t)), - this, TQT_SLOT(slotTotalSize(TDEIO::Job *, TDEIO::filesize_t))); + TQObject::disconnect(m_job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + TQObject::disconnect(m_job, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotResult(TDEIO::Job *))); + TQObject::disconnect(m_job, TQ_SIGNAL(mimetype(TDEIO::Job *, const TQString &)), + this, TQ_SLOT(slotScanMimeType(TDEIO::Job *, const TQString &))); + TQObject::disconnect(m_job, TQ_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t)), + this, TQ_SLOT(slotTotalSize(TDEIO::Job *, TDEIO::filesize_t))); if ( m_streamPulled ) outdata.endPull(); diff --git a/arts/kde/kioinputstream_impl.h b/arts/kde/kioinputstream_impl.h index 1d18f6421..45bb34cd1 100644 --- a/arts/kde/kioinputstream_impl.h +++ b/arts/kde/kioinputstream_impl.h @@ -35,7 +35,7 @@ class TDEIOInputStream_impl : public TQObject, virtual public TDEIOInputStream_s virtual public InputStream_skel, virtual public StdSynthModule { -Q_OBJECT +TQ_OBJECT public: TDEIOInputStream_impl(); ~TDEIOInputStream_impl(); diff --git a/arts/kde/kiotest.cc b/arts/kde/kiotest.cpp index ed9a3fadf..ed9a3fadf 100644 --- a/arts/kde/kiotest.cc +++ b/arts/kde/kiotest.cpp diff --git a/arts/kde/kiotestslow.cc b/arts/kde/kiotestslow.cpp index 93bfac388..93bfac388 100644 --- a/arts/kde/kiotestslow.cc +++ b/arts/kde/kiotestslow.cpp diff --git a/arts/kde/kplayobject.cc b/arts/kde/kplayobject.cpp index becb20a58..a9b3a8a36 100644 --- a/arts/kde/kplayobject.cc +++ b/arts/kde/kplayobject.cpp @@ -179,7 +179,7 @@ void KDE::PlayObject::play() if ( d->creator ) delete d->creator; d->creator = new KDE::PlayObjectCreator( d->server ); - d->creator->create( d->url, d->createBUS, this, TQT_SLOT( attachPlayObject( Arts::PlayObject ) ) ); + d->creator->create( d->url, d->createBUS, this, TQ_SLOT( attachPlayObject( Arts::PlayObject ) ) ); kdDebug( 400 ) << "KDE::PlayObject::play(): creator called" << endl; d->internalState = Arts::posPlaying; } @@ -299,5 +299,3 @@ bool KDE::PlayObject::stream() { return m_isStream; } - -// vim: sw=4 ts=4 noet diff --git a/arts/kde/kplayobject.h b/arts/kde/kplayobject.h index f5bd849be..b53ba0003 100644 --- a/arts/kde/kplayobject.h +++ b/arts/kde/kplayobject.h @@ -27,9 +27,9 @@ #include <kurl.h> #include <tqobject.h> -class KDE_EXPORT KPlayObject : public TQObject +class TDE_EXPORT KPlayObject : public TQObject { -Q_OBJECT +TQ_OBJECT public: KPlayObject(); KPlayObject(Arts::PlayObject playobject, bool isStream); @@ -185,9 +185,9 @@ class PlayObjectFactory; * internal state until the real Arts::PlayObject got created, afterwards * the state of the Arts::PlayObject will be returned. */ -class KDE_EXPORT PlayObject : public TQObject +class TDE_EXPORT PlayObject : public TQObject { -Q_OBJECT +TQ_OBJECT public: ~PlayObject(); diff --git a/arts/kde/kplayobjectcreator.cc b/arts/kde/kplayobjectcreator.cpp index 039c8a3bc..4b8f0ba01 100644 --- a/arts/kde/kplayobjectcreator.cc +++ b/arts/kde/kplayobjectcreator.cpp @@ -44,7 +44,7 @@ bool KDE::PlayObjectCreator::create(const KURL& url, bool createBUS, const TQObj if (m_server.isNull() || url.isEmpty() ) return false; - connect( this, TQT_SIGNAL( playObjectCreated( Arts::PlayObject ) ), + connect( this, TQ_SIGNAL( playObjectCreated( Arts::PlayObject ) ), receiver, slot ); // check if the URL is a local file @@ -57,8 +57,8 @@ bool KDE::PlayObjectCreator::create(const KURL& url, bool createBUS, const TQObj m_instream = Arts::TDEIOInputStream::_from_base(instream_impl); // signal will be called once the ioslave knows the mime-type of the stream - connect(instream_impl, TQT_SIGNAL(mimeTypeFound(const TQString &)), - this, TQT_SLOT(slotMimeType(const TQString &))); + connect(instream_impl, TQ_SIGNAL(mimeTypeFound(const TQString &)), + this, TQ_SLOT(slotMimeType(const TQString &))); // GO! m_instream.openURL(url.url().latin1()); diff --git a/arts/kde/kplayobjectcreator.h b/arts/kde/kplayobjectcreator.h index 74e571c8e..e0935ed22 100644 --- a/arts/kde/kplayobjectcreator.h +++ b/arts/kde/kplayobjectcreator.h @@ -31,7 +31,7 @@ namespace KDE { class PlayObjectCreator : public TQObject { -Q_OBJECT +TQ_OBJECT public: PlayObjectCreator(Arts::SoundServerV2 server); ~PlayObjectCreator(); diff --git a/arts/kde/kplayobjectfactory.cc b/arts/kde/kplayobjectfactory.cpp index d2d76f25c..ef10a925b 100644 --- a/arts/kde/kplayobjectfactory.cc +++ b/arts/kde/kplayobjectfactory.cpp @@ -179,7 +179,7 @@ KDE::PlayObject *KDE::PlayObjectFactory::createPlayObject(const KURL& _url, cons d->helper->po = d->playObj; d->helper->ap = d->amanPlay; if( d->playObj->object().isNull() && d->amanPlay ) - TQObject::connect( d->playObj, TQT_SIGNAL( playObjectCreated() ), d->helper, TQT_SLOT( connectAmanPlay() ) ); + TQObject::connect( d->playObj, TQ_SIGNAL( playObjectCreated() ), d->helper, TQ_SLOT( connectAmanPlay() ) ); else d->helper->connectAmanPlay(); } @@ -254,5 +254,3 @@ void KDE::POFHelper::connectAmanPlay() } #include "kplayobjectfactory_p.moc" - -// vim: sw=4 ts=4 noet diff --git a/arts/kde/kplayobjectfactory.h b/arts/kde/kplayobjectfactory.h index 4d0fa9c83..a0bc841c2 100644 --- a/arts/kde/kplayobjectfactory.h +++ b/arts/kde/kplayobjectfactory.h @@ -30,7 +30,7 @@ class KArtsServer; -class KDE_EXPORT KPlayObjectFactory +class TDE_EXPORT KPlayObjectFactory { public: /** @@ -76,7 +76,7 @@ class POFHelper; * use the KDE multimedia framework can be found in the documentation * for KDE::PlayObject. */ -class KDE_EXPORT PlayObjectFactory// : public TQObject ### for KDE4 make it a TQObject to be able to receive signals +class TDE_EXPORT PlayObjectFactory// : public TQObject ### for KDE4 make it a TQObject to be able to receive signals { public: /** @@ -153,4 +153,3 @@ private: } #endif -// vim: sw=4 ts=4 noet diff --git a/arts/kde/kplayobjectfactory_p.h b/arts/kde/kplayobjectfactory_p.h index 6d4b1fa26..9f4586e18 100644 --- a/arts/kde/kplayobjectfactory_p.h +++ b/arts/kde/kplayobjectfactory_p.h @@ -32,7 +32,7 @@ namespace KDE class POFHelper : public TQObject { friend class PlayObjectFactory; - Q_OBJECT + TQ_OBJECT private slots: void connectAmanPlay(); private: @@ -43,4 +43,3 @@ private: } #endif // KPLAYOBJECTFACTORY_P_H -// vim: sw=4 ts=4 noet diff --git a/arts/kde/kvideowidget.cpp b/arts/kde/kvideowidget.cpp index f78c5c5db..618a2ccd5 100644 --- a/arts/kde/kvideowidget.cpp +++ b/arts/kde/kvideowidget.cpp @@ -19,7 +19,7 @@ #include <tqaccel.h> #include <tqcursor.h> -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY #include <X11/Xlib.h> #include <X11/Xutil.h> #else @@ -49,7 +49,7 @@ KFullscreenVideoWidget::KFullscreenVideoWidget( KVideoWidget *parent, const char { this->videoWidget = parent; setEraseColor( black ); - setCursor(TQCursor(Qt::BlankCursor)); + setCursor(TQCursor(TQt::BlankCursor)); } void KFullscreenVideoWidget::windowActivationChange( bool ) @@ -62,7 +62,7 @@ void KFullscreenVideoWidget::windowActivationChange( bool ) bool KFullscreenVideoWidget::x11Event( XEvent *event ) { -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY if (event->type == ClientMessage && event->xclient.message_type == XInternAtom( tqt_xdisplay(), "VPO_RESIZE_NOTIFY", False )) @@ -93,7 +93,7 @@ void KVideoWidget::init(void) { setMinimumSize(0, 0); setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); - setFocusPolicy( TQ_ClickFocus ); + setFocusPolicy( TQWidget::ClickFocus ); fullscreenWidget = 0; poVideo = Arts::VideoPlayObject::null(); @@ -102,16 +102,16 @@ void KVideoWidget::init(void) // Setup actions new TDEToggleAction( i18n("Fullscreen &Mode"), "view-fullscreen", - CTRL+SHIFT+Key_F, TQT_TQOBJECT(this), TQT_SLOT(fullscreenActivated()), + CTRL+SHIFT+Key_F, this, TQ_SLOT(fullscreenActivated()), actionCollection(), "fullscreen_mode" ); new TDERadioAction( i18n("&Half Size"), ALT+Key_0, - TQT_TQOBJECT(this), TQT_SLOT(halfSizeActivated()), + this, TQ_SLOT(halfSizeActivated()), actionCollection(), "half_size" ); new TDERadioAction( i18n("&Normal Size"), ALT+Key_1, - TQT_TQOBJECT(this), TQT_SLOT(normalSizeActivated()), + this, TQ_SLOT(normalSizeActivated()), actionCollection(), "normal_size" ); new TDERadioAction( i18n("&Double Size"), ALT+Key_2, - TQT_TQOBJECT(this), TQT_SLOT(doubleSizeActivated()), + this, TQ_SLOT(doubleSizeActivated()), actionCollection(), "double_size" ); ((TDEToggleAction *)action( "half_size" ))->setExclusiveGroup( "KVideoWidget::zoom" ); @@ -191,7 +191,7 @@ void KVideoWidget::embed( Arts::VideoPlayObject vpo ) TQImage KVideoWidget::snapshot( Arts::VideoPlayObject vpo ) { -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY Window root; Pixmap pixmap; XImage *xImage; @@ -213,7 +213,7 @@ TQImage KVideoWidget::snapshot( Arts::VideoPlayObject vpo ) } // Convert 32bit RGBA image data into Qt image - TQImage qImage = TQImage( (uchar *)xImage->data, width/32, height, 32, (QRgb *)0, 0, TQImage::IgnoreEndian ).copy(); + TQImage qImage = TQImage( (uchar *)xImage->data, width/32, height, 32, (TQRgb *)0, 0, TQImage::IgnoreEndian ).copy(); // Free X11 resources and return Qt image XDestroyImage( xImage ); @@ -306,7 +306,7 @@ void KVideoWidget::mousePressEvent( TQMouseEvent *event ) emit mouseButtonPressed( event->button(), pos, event->state() ); // ### Remove in KDE4 - if ( event->button() == Qt::RightButton ) + if ( event->button() == TQt::RightButton ) emit rightButtonPressed( pos ); } @@ -358,7 +358,7 @@ void KVideoWidget::resizeNotify( int width, int height ) bool KVideoWidget::x11Event( XEvent *event ) { -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY if (event->type == ClientMessage && event->xclient.message_type == XInternAtom( tqt_xdisplay(), "VPO_RESIZE_NOTIFY", False )) @@ -379,20 +379,20 @@ void KVideoWidget::fullscreenActivated() fullscreenWidget = new KFullscreenVideoWidget( this ); // Interconnect mouse button signals - connect( fullscreenWidget, TQT_SIGNAL(mouseButtonPressed( int, const TQPoint &, int )), - this, TQT_SIGNAL(mouseButtonPressed( int, const TQPoint &, int)) ); + connect( fullscreenWidget, TQ_SIGNAL(mouseButtonPressed( int, const TQPoint &, int )), + this, TQ_SIGNAL(mouseButtonPressed( int, const TQPoint &, int)) ); - connect( fullscreenWidget, TQT_SIGNAL(mouseButtonDoubleClick( const TQPoint &, int )), - this, TQT_SIGNAL(mouseButtonDoubleClick( const TQPoint &, int )) ); + connect( fullscreenWidget, TQ_SIGNAL(mouseButtonDoubleClick( const TQPoint &, int )), + this, TQ_SIGNAL(mouseButtonDoubleClick( const TQPoint &, int )) ); // ### Remove in KDE4 - connect( fullscreenWidget, TQT_SIGNAL(rightButtonPressed(const TQPoint &)), - this, TQT_SIGNAL(rightButtonPressed(const TQPoint &)) ); + connect( fullscreenWidget, TQ_SIGNAL(rightButtonPressed(const TQPoint &)), + this, TQ_SIGNAL(rightButtonPressed(const TQPoint &)) ); // Leave fullscreen mode with <Escape> key TQAccel *a = new TQAccel( fullscreenWidget ); a->connectItem( a->insertItem( Key_Escape ), - this, TQT_SLOT(setWindowed()) ); + this, TQ_SLOT(setWindowed()) ); fullscreenWidget->setFocus(); fullscreenWidget->showFullScreen(); diff --git a/arts/kde/kvideowidget.h b/arts/kde/kvideowidget.h index 0e3881a93..9cd8239a9 100644 --- a/arts/kde/kvideowidget.h +++ b/arts/kde/kvideowidget.h @@ -20,7 +20,7 @@ class KDE_ARTS_EXPORT KVideoWidget : public TQWidget, virtual public KXMLGUIClient { -Q_OBJECT +TQ_OBJECT public: KVideoWidget( KXMLGUIClient *clientParent, TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); diff --git a/arts/kde/mcop-dcop/CMakeL10n.txt b/arts/kde/mcop-dcop/CMakeL10n.txt index dd4b625cd..9d805b9ef 100644 --- a/arts/kde/mcop-dcop/CMakeL10n.txt +++ b/arts/kde/mcop-dcop/CMakeL10n.txt @@ -1,3 +1,9 @@ ##### create translation templates ############## tde_l10n_create_template( "kmcop" ) + +tde_l10n_create_template( + CATALOG "desktop_files/kmcop.desktop/" + SOURCES kmcop.desktop + DESTINATION "${CMAKE_SOURCE_DIR}/translations" +) diff --git a/arts/kde/mcop-dcop/kmcop.cpp b/arts/kde/mcop-dcop/kmcop.cpp index d5e8c8642..a4f1430f4 100644 --- a/arts/kde/mcop-dcop/kmcop.cpp +++ b/arts/kde/mcop-dcop/kmcop.cpp @@ -17,7 +17,7 @@ */ #include <kdebug.h> -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> #include <tdelocale.h> @@ -54,15 +54,15 @@ int main(int argc, char **argv) aboutdata.addAuthor("Nikolas Zimmermann", I18N_NOOP("Author"), "wildfox@kde.org"); TDECmdLineArgs::init(argc, argv, &aboutdata); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); - if(!KUniqueApplication::start()) + if(!TDEUniqueApplication::start()) { kdDebug() << "Running kmcop found" << endl; return 0; } - KUniqueApplication app; + TDEUniqueApplication app; app.disableSessionManagement(); KArtsDispatcher dispatcher; diff --git a/arts/kde/mcop-dcop/kmcop.desktop b/arts/kde/mcop-dcop/kmcop.desktop index 972e6fe93..f802e8dd1 100644 --- a/arts/kde/mcop-dcop/kmcop.desktop +++ b/arts/kde/mcop-dcop/kmcop.desktop @@ -1,89 +1,8 @@ [Desktop Entry] Type=Service Name=KMCOP -Name[hi]=के-एमकॉप -Name[te]=కెఎంకాప్ -Exec=kmcop Comment=TDE MCOP-DCOP Bridge -Comment[af]=TDE MCOP-DCOP Brug -Comment[ar]=جسر TDE MCOP-DCOP -Comment[az]=TDE MCOP-DCOP Körpüsü -Comment[be]=Сувязь MCOP/DCOP -Comment[bn]=কে.ডি.ই MCOP-DCOP ব্রিজ -Comment[br]=Pont TDE MCOP-DCOP -Comment[bs]=TDE MCOP-DCOP prelaz -Comment[ca]=Connector MCOP-DCOP per al TDE -Comment[cs]=TDE MCOP-DCOP můstek -Comment[csb]=Mostk TDE MCOP-DCOP -Comment[cy]=Pont MCOP-DCOP TDE -Comment[da]=TDE MCOP-DCOP-bro -Comment[de]=Verbindung zwischen MCOP und DCOP -Comment[el]=Γέφυρα MCOP-DCOP του TDE -Comment[eo]=TDE-ponto inter MCOP-DCOP -Comment[es]=Puente TDE MCOP-DCOP -Comment[et]=TDE MCOP-DCOP sild -Comment[eu]=TDEren MCOP-DCOP zubia -Comment[fa]=پل TDE MCOP-DCOP -Comment[fi]=MCOP-DCOP -silta -Comment[fo]=TDE MCOP-DCOP-brúgv -Comment[fr]=Passerelle MCOP-DCOP pour TDE -Comment[ga]=Droichead TDE idir MCOP agus DCOP -Comment[gl]=Ponte MCOP-DCOP de TDE -Comment[he]=גשר MCOP-DCOP ל־TDE -Comment[hi]=केडीई MCOP-डीकॉप ब्रिज -Comment[hr]=TDE most MCOP-DCOP -Comment[hsb]=TDE MCOP-DCOP-móst -Comment[hu]=TDE MCOP-DCOP összekötőprogram -Comment[id]=Jembatan TDE MCOP-DCOP -Comment[is]=TDE MCOP-DCOP brú -Comment[it]=Ponte MCOP-DCOP per TDE -Comment[ja]=TDE MCOP-DCOP ブリッジ -Comment[ka]=TDE MCOP-DCOP ხიდი -Comment[kk]=TDE MCOP-DCOP көпірі -Comment[ko]=TDE MCOP-DCOP 브릿지 -Comment[lb]=TDE-MCOP-DCOP-Bréck -Comment[lt]=TDE MCOP-DCOP tiltas -Comment[lv]=TDE MCOP-DCOP Tilts -Comment[mk]=TDE MCOP-DCOP Мост -Comment[mn]=TDE-н MCOP ба DCOP хоорондын гүүр -Comment[ms]=Jambatan TDE MCOP-DCOP -Comment[mt]=Pont bejn MCOP u DCOP -Comment[nb]=TDE MCOP-DCOP Bro -Comment[nds]=TDE-Brüch twischen MCOP un DCOP -Comment[ne]=TDE MCOP-DCOP ब्रिज -Comment[nn]=MCOP-DCOP-bru for TDE -Comment[nso]=Leporogo la TDE MCOP-DCOP -Comment[pa]=TDE MCOP-DCOP ਪੁੱਲ -Comment[pl]=Mostek MCOP-DCOP -Comment[pt]=Ponte MCOP-DCOP para o TDE -Comment[pt_BR]=Ligação TDE MCOP-DCOP -Comment[ro]=Punte MCOP-DCOP TDE -Comment[ru]=Мост MCOP-DCOP -Comment[rw]=Iteme MCOP-DCOP TDE -Comment[se]=TDE MCOP-DCOP šaldi -Comment[sk]=Most TDE MCOP-DCOP -Comment[sl]=Premostitelj MCOP-DCOP za TDE -Comment[sq]=Ura e TDE MCOP-DCOP-it -Comment[sr]=TDED MCOP-DCOP мост -Comment[sr@Latn]=TDED MCOP-DCOP most -Comment[ss]=Libhuloho le MCOP-DCOP ku TDE -Comment[sv]=TDE MCOP-DCOP-brygga -Comment[ta]=கேடிஇ MCOP-DCOP பாலம் -Comment[te]=కెడిఈ ఎంసిఓపి-డిసిఓపి వారధి -Comment[tg]=Пайвасти TDE MCOP-DCOP -Comment[th]=ตัวเชื่อม TDE MCOP-DCOP -Comment[tr]=TDE MCOP-DCOP Köprüsü -Comment[tt]=TDE MCOP-DCOP Küpere -Comment[uk]=Міст TDE MCOP-DCOP -Comment[uz]=TDE MCOP-DCOP koʻprigi -Comment[uz@cyrillic]=TDE MCOP-DCOP кўприги -Comment[ven]=TDE MCOP-DCOP Buroho -Comment[vi]=Cầu MCOP-DCOP của TDE -Comment[xh]=TDE MCOP-DCOP Ibhulorho -Comment[zh_CN]=TDE MCOP-DCOP 桥 -Comment[zh_HK]=TDE MCOP-DCOP 橋樑 -Comment[zh_TW]=TDE MCOP-DCOP 橋樑 -Comment[zu]=Ibhulogo le-TDE MCOP-DCOP +Exec=kmcop Icon=kmcop X-TDE-ServiceTypes=KMCOP X-DCOP-ServiceType=Unique diff --git a/arts/kde/mcop-dcop/kmcop.h b/arts/kde/mcop-dcop/kmcop.h index 5ffa57bcd..aae0792b3 100644 --- a/arts/kde/mcop-dcop/kmcop.h +++ b/arts/kde/mcop-dcop/kmcop.h @@ -29,7 +29,7 @@ class KMCOPPrivate; class KMCOP : public TQObject, public DCOPObject { -Q_OBJECT +TQ_OBJECT K_DCOP public: diff --git a/arts/knotify/CMakeL10n.txt b/arts/knotify/CMakeL10n.txt index 422cd20e0..23022d03f 100644 --- a/arts/knotify/CMakeL10n.txt +++ b/arts/knotify/CMakeL10n.txt @@ -1,3 +1,9 @@ ##### create translation templates ############## tde_l10n_create_template( "knotify" ) + +tde_l10n_create_template( + CATALOG "desktop_files/knotify.desktop/" + SOURCES knotify.desktop + DESTINATION "${CMAKE_SOURCE_DIR}/translations" +) diff --git a/arts/knotify/CMakeLists.txt b/arts/knotify/CMakeLists.txt index c290e9188..77b8f9a0a 100644 --- a/arts/knotify/CMakeLists.txt +++ b/arts/knotify/CMakeLists.txt @@ -29,7 +29,10 @@ link_directories( ##### other data ################################ -install( FILES knotify.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE knotify.desktop + DESTINATION ${SERVICES_INSTALL_DIR} +) ##### knotify ################################### @@ -49,6 +52,5 @@ endif( ARTS_FOUND ) tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} LINK ${LIBS} - DEPENDENCIES dcopidl DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/arts/knotify/README b/arts/knotify/README index 3257cdc33..676dcc25e 100644 --- a/arts/knotify/README +++ b/arts/knotify/README @@ -31,3 +31,17 @@ example, while the screen is locked, it is very likely that the user is not present. Thus, he will not be able to hear a "You have mail" sound (or to see a talk request). Re-routing this to a log window sounds like a very good idea. + +Notes: +------ + +KNotify can be accessed directly using one of the available methods. + - void notify(TQString event, TQString fromApp, TQString text, TQString sound, + TQString file, int present, int level) + - void notify(TQString event, TQString fromApp, TQString text, TQString sound, + TQString file, int present, int level, int winId) + - void notify(TQString event, TQString fromApp, TQString text, TQString sound, + TQString file, int present, int level, int winId, int eventId) + +For example: + dcop knotify Notify notify event "Msg from MyApp" "Hello World!" "" "" 16 0 diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp index 9f50d5870..85b8f36ba 100644 --- a/arts/knotify/knotify.cpp +++ b/arts/knotify/knotify.cpp @@ -62,9 +62,9 @@ #include <kplayobjectfactory.h> #include <kaudiomanagerplay.h> #endif -#include <kprocess.h> -#include <kstandarddirs.h> -#include <kuniqueapplication.h> +#include <tdeprocess.h> +#include <tdestandarddirs.h> +#include <tdeuniqueapplication.h> #include <twin.h> #include "knotify.h" @@ -102,7 +102,7 @@ class KNotifyPrivate #endif extern "C"{ - KDE_EXPORT int kdemain(int argc, char **argv) { + TDE_EXPORT int kdemain(int argc, char **argv) { TDEAboutData aboutdata("knotify", I18N_NOOP("KNotify"), "3.0", I18N_NOOP("TDE Notification Server"), TDEAboutData::License_GPL, "(C) 1997-2003, KDE Developers"); @@ -112,15 +112,15 @@ extern "C"{ aboutdata.addAuthor("Charles Samuels",I18N_NOOP("Previous Maintainer"),"charles@kde.org"); TDECmdLineArgs::init( argc, argv, &aboutdata ); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); // initialize application - if ( !KUniqueApplication::start() ) { + if ( !TDEUniqueApplication::start() ) { kdDebug() << "Running knotify found" << endl; return 0; } - KUniqueApplication app; + TDEUniqueApplication app; app.disableSessionManagement(); // KNotify is started on KDE startup and on demand (using @@ -247,7 +247,7 @@ KNotify::KNotify( bool useArts ) d->playObjects.setAutoDelete(true); d->audioManager = 0; if( useArts ) { - connect( soundServer, TQT_SIGNAL( restartedServer() ), this, TQT_SLOT( restartedArtsd() ) ); + connect( soundServer, TQ_SIGNAL( restartedServer() ), this, TQ_SLOT( restartedArtsd() ) ); restartedArtsd(); //started allready need to initialize d->audioManager } #endif @@ -298,7 +298,7 @@ void KNotify::loadConfig() { void KNotify::reconfigure() { - kapp->config()->reparseConfiguration(); + tdeApp->config()->reparseConfiguration(); loadConfig(); // clear loaded config files @@ -530,7 +530,7 @@ bool KNotify::notifyBySound( const TQString &sound, const TQString &appname, int if ( !d->playTimer ) { d->playTimer = new TQTimer( this ); - connect( d->playTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( playTimeout() ) ); + connect( d->playTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( playTimeout() ) ); } if ( !d->playTimer->isActive() ) { d->playTimer->start( 1000 ); @@ -543,7 +543,7 @@ bool KNotify::notifyBySound( const TQString &sound, const TQString &appname, int TDEProcess *proc = d->externalPlayerProc; if (!proc) { proc = d->externalPlayerProc = new TDEProcess; - connect( proc, TQT_SIGNAL( processExited( TDEProcess * )), TQT_SLOT( slotPlayerProcessExited( TDEProcess * ))); + connect( proc, TQ_SIGNAL( processExited( TDEProcess * )), TQ_SLOT( slotPlayerProcessExited( TDEProcess * ))); } if (proc->isRunning()) { soundFinished( eventId, PlayerBusy ); @@ -756,12 +756,12 @@ void KNotify::soundFinished( int eventId, PlayingFinishedStatus reason ) WId KNotify::checkWinId( const TQString &appName, WId senderWinId ) { if ( senderWinId == 0 ) { - TQCString senderId = kapp->dcopClient()->senderId(); + TQCString senderId = tdeApp->dcopClient()->senderId(); TQCString compare = (appName + "-mainwindow").latin1(); int len = compare.length(); // kdDebug() << "notifyByPassivePopup: appName=" << appName << " sender=" << senderId << endl; - QCStringList objs = kapp->dcopClient()->remoteObjects( senderId ); + QCStringList objs = tdeApp->dcopClient()->remoteObjects( senderId ); for (QCStringList::ConstIterator it = objs.begin(); it != objs.end(); ++it ) { TQCString obj( *it ); if ( obj.left(len) == compare) { @@ -769,7 +769,7 @@ WId KNotify::checkWinId( const TQString &appName, WId senderWinId ) TQCString replyType; TQByteArray data, replyData; - if ( kapp->dcopClient()->call(senderId, obj, "getWinID()", data, replyType, replyData) ) { + if ( tdeApp->dcopClient()->call(senderId, obj, "getWinID()", data, replyType, replyData) ) { TQDataStream answer(replyData, IO_ReadOnly); if (replyType == "int") { answer >> senderWinId; @@ -800,5 +800,3 @@ void KNotify::sessionReady() } d->inStartup = false; } - -// vim: sw=4 sts=4 ts=8 et diff --git a/arts/knotify/knotify.desktop b/arts/knotify/knotify.desktop index 7718c98f5..972ef4569 100644 --- a/arts/knotify/knotify.desktop +++ b/arts/knotify/knotify.desktop @@ -1,118 +1,8 @@ [Desktop Entry] Type=Service Name=KNotify -Name[af]=Knotify -Name[ar]=برنامج الإبلاغ -Name[bn]=কে-নোটিফাই -Name[csb]=Òdkôzanié -Name[cy]=KHysbyu -Name[eo]=Katentigilo -Name[fo]=KÁminning -Name[hi]=के-नोटिफाई -Name[ka]=სისტემური შეტყობინება -Name[ko]=K알림이 -Name[mn]=Сонордуулга -Name[ne]=केनोटिफाइ -Name[nso]=KLemosa -Name[pa]=ਕੇਟਿੱਪਣੀ -Name[pl]=Powiadamianie -Name[pt_BR]=Notificações -Name[ru]=Системные сообщения -Name[ss]=KNotify -Name[sv]=Knotify -Name[ta]=கேகுறிப்பெடு -Name[te]=కెనోటిఫై -Name[tg]=Хабарҳои системавӣ -Name[th]=ระบบแจ้งเตือน - K -Name[ven]=U divhadza ha K -Name[zu]=I-KNotify -Exec=knotify Comment=TDE Notification Daemon -Comment[af]=Kde Inkennisstelling Bediener -Comment[ar]=مراقب تنبيهات كيدي -Comment[az]=TDE Bildiriş Demonu -Comment[be]=Сервіс нагадванняў TDE -Comment[bg]=Сървър за съобщения -Comment[bn]=কে.ডি.ই নোটিশ সরবরাহকারী ডিমন -Comment[br]=Diaoul Kemennadenn TDE -Comment[bs]=TDE Sistemska obavještenja -Comment[ca]=Dimoni de notificacions per al TDE -Comment[cs]=Démon pro systémová hlášení prostředí TDE -Comment[csb]=Demon òdkôzëwaniô TDE -Comment[cy]=Daemon Hysbysu TDE -Comment[da]=TDE Bekendtgørelsesdæmon -Comment[de]=TDE-Benachrichtigungsprogramm -Comment[el]=Δαίμονας ειδοποίησης του TDE -Comment[eo]=TDE-Sistematentigo-demono -Comment[es]=Demonio de notificación de TDE -Comment[et]=TDE süsteemsete märguannete deemon -Comment[eu]=TDEko jakinarazpenaren daemona -Comment[fa]=شبح اخطار TDE -Comment[fi]=TDE:n huomautuspalvelin -Comment[fo]=Áminningarandi TDE's -Comment[fr]=Démon de notifications de TDE -Comment[fy]=TDE's systeemberjochtenprogramma -Comment[ga]=Deamhan Fógartha TDE -Comment[gl]=Demo de notificacións de TDE -Comment[he]=תהליך הרקע הודעות של TDE -Comment[hi]=केडीई सूचना ङेमन -Comment[hr]=TDE demon obavještavanja -Comment[hsb]=TDE-demon za zdźělenki -Comment[hu]=TDE figyelmeztető szolgáltatás -Comment[id]=Daemon pemberitahuan TDE -Comment[is]=TDE tilkynningapúkinn -Comment[it]=Demone avvisi di TDE -Comment[ja]=TDE 通知デーモン -Comment[ka]=TDE შეტყობინებების შიკრიკი -Comment[kk]=TDE құлақтандыру қызметі -Comment[ko]=TDE용 알림 서버 -Comment[lb]=TDE-Norichtendämon -Comment[lt]=TDE pranešimų tarnyba -Comment[lv]=TDE Apziņošanas Dēmons -Comment[mi]=Kaikorero TDE -Comment[mk]=TDE даемон за известувања -Comment[mn]=TDE-Сонордуулга программ -Comment[ms]=Daemon Pemberitahuan TDE -Comment[mt]=Daemon tan-notifika TDE -Comment[nb]=TDE Varslings-nisse -Comment[nds]=TDE-Dämoon för Bescheden -Comment[ne]=TDE सूचना डेइमन -Comment[nl]=TDE's systeemnotificatieprogramma -Comment[nn]=TDE-varselnisse -Comment[nso]=Daemon ya Tsebiso ya TDE -Comment[oc]=Dimoni de notificacion TDE -Comment[pa]=TDE ਟਿੱਪਣੀ ਪੇਸ਼ਕਾਰ -Comment[pl]=Demon powiadamiania TDE -Comment[pt]=Servidor de mensagens do TDE -Comment[pt_BR]=Serviço de notificação do TDE -Comment[ro]=Demon de notificare TDE -Comment[ru]=Системные сообщения TDE -Comment[rw]=Dayimoni y'Imenyesha TDE -Comment[se]=TDE dieđihanbálvá -Comment[sk]=TDE Oznamovací démon -Comment[sl]=Sistemska obvestila TDE -Comment[sq]=TDE Demoni i Njoftimit -Comment[sr]=TDE Демон за обавештавање -Comment[sr@Latn]=TDE Demon za obaveštavanje -Comment[ss]=I-daemon yekwatisa ku TDE -Comment[sv]=TDE:s underrättelsedemon -Comment[ta]=கேடிஇ அறிவிப்பு டேமன் -Comment[te]=కెడిఈ ప్రకటనల సూత్రధారి -Comment[tg]=Хабарҳои системавии TDE -Comment[th]=เดมอนการแจ้งเตือนของ TDE -Comment[tr]=TDE Bilgilendirme Programı -Comment[tt]=TDE'nıñ Kisätü Xezmäte -Comment[uk]=Демон сповіщення про нову пошту -Comment[uz]=TDE xabarnomalar xizmati -Comment[uz@cyrillic]=TDE хабарномалар хизмати -Comment[ven]=Daemon yau divhadza ya TDE -Comment[vi]=Trình nền thông báo của TDE -Comment[wa]=Démon di notifiaedje di TDE -Comment[xh]=Daemon Ulwaziso lwe TDE -Comment[zh_CN]=TDE 通告守护进程 -Comment[zh_HK]=TDE 通知伺服程式 -Comment[zh_TW]=TDE 通知服務程式 -Comment[zu]=Isaziso se-Daemon ye-TDE +Exec=knotify Icon=knotify X-TDE-ServiceTypes=KNotify X-DCOP-ServiceType=Unique diff --git a/arts/knotify/knotify.h b/arts/knotify/knotify.h index 8348f3d40..b74fca3b2 100644 --- a/arts/knotify/knotify.h +++ b/arts/knotify/knotify.h @@ -30,7 +30,7 @@ class TDEConfig; class KNotify : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP public: diff --git a/arts/message/CMakeLists.txt b/arts/message/CMakeLists.txt index 12e91f65e..0a9be01cb 100644 --- a/arts/message/CMakeLists.txt +++ b/arts/message/CMakeLists.txt @@ -26,7 +26,7 @@ link_directories( set( target artsmessage ) set( ${target}_SRCS - artsmessage.cc + artsmessage.cpp ) tde_add_executable( ${target} diff --git a/arts/message/Makefile.am b/arts/message/Makefile.am index 24b7a6d18..363d561df 100644 --- a/arts/message/Makefile.am +++ b/arts/message/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = $(all_includes) bin_PROGRAMS = artsmessage -artsmessage_SOURCES = artsmessage.cc +artsmessage_SOURCES = artsmessage.cpp artsmessage_LDADD = ../../tdeui/libtdeui.la artsmessage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(KDE_MT_LDFLAGS) diff --git a/arts/message/artsmessage.cc b/arts/message/artsmessage.cpp index eaa5c8e2c..eaa5c8e2c 100644 --- a/arts/message/artsmessage.cc +++ b/arts/message/artsmessage.cpp |