diff options
44 files changed, 43 insertions, 43 deletions
diff --git a/admin b/admin -Subproject 34c35e11fbc7237f94ec8ede61ef0c8c9b6c58b +Subproject b770a18e00a82febd12c1787247533771ecbb57 diff --git a/juk/akodeplayer.h b/juk/akodeplayer.h index ebeeba94..009afb2d 100644 --- a/juk/akodeplayer.h +++ b/juk/akodeplayer.h @@ -27,7 +27,7 @@ #include <tqstring.h> #include "player.h" -#include <kdemacros.h> +#include <tdemacros.h> namespace aKode { class File; diff --git a/libkcddb/cache.h b/libkcddb/cache.h index 50dbdc97..939c9b36 100644 --- a/libkcddb/cache.h +++ b/libkcddb/cache.h @@ -26,7 +26,7 @@ #include <tqstring.h> #include "cdinfo.h" -#include <kdemacros.h> +#include <tdemacros.h> namespace KCDDB { class TDE_EXPORT Cache diff --git a/libkcddb/cdinfo.h b/libkcddb/cdinfo.h index 25d94804..15984b11 100644 --- a/libkcddb/cdinfo.h +++ b/libkcddb/cdinfo.h @@ -24,7 +24,7 @@ #include <tqstringlist.h> #include <tqvaluelist.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <tqvariant.h> namespace KCDDB diff --git a/libkcddb/client.h b/libkcddb/client.h index e28f9612..fd4cdbf5 100644 --- a/libkcddb/client.h +++ b/libkcddb/client.h @@ -25,7 +25,7 @@ #include "cdinfo.h" #include <tqobject.h> #include "cddb.h" -#include <kdemacros.h> +#include <tdemacros.h> namespace KCDDB { diff --git a/mpeglib/example/yaf/yafcore/buffer.h b/mpeglib/example/yaf/yafcore/buffer.h index 93f4f3d8..ae008d6c 100644 --- a/mpeglib/example/yaf/yafcore/buffer.h +++ b/mpeglib/example/yaf/yafcore/buffer.h @@ -22,7 +22,7 @@ extern "C" { #include <string.h> #include <stdio.h> } -#include <kdemacros.h> +#include <tdemacros.h> class TDE_EXPORT Buffer { diff --git a/mpeglib/example/yaf/yafcore/commandTable.h b/mpeglib/example/yaf/yafcore/commandTable.h index 77d51906..679913cc 100644 --- a/mpeglib/example/yaf/yafcore/commandTable.h +++ b/mpeglib/example/yaf/yafcore/commandTable.h @@ -21,7 +21,7 @@ extern"C" { #include <stdio.h> } -#include <kdemacros.h> +#include <tdemacros.h> #define _CT_START 40 diff --git a/mpeglib/example/yaf/yafcore/inputDecoder.h b/mpeglib/example/yaf/yafcore/inputDecoder.h index 4051fd3d..aa22337d 100644 --- a/mpeglib/example/yaf/yafcore/inputDecoder.h +++ b/mpeglib/example/yaf/yafcore/inputDecoder.h @@ -19,7 +19,7 @@ #include "outputInterface.h" #include <strings.h> -#include <kdemacros.h> +#include <tdemacros.h> #define _DECODER_STATUS_IDLE 1 #define _DECODER_STATUS_WORKING 2 diff --git a/mpeglib/example/yaf/yafcore/inputInterface.h b/mpeglib/example/yaf/yafcore/inputInterface.h index d22bc615..2f2ffd44 100644 --- a/mpeglib/example/yaf/yafcore/inputInterface.h +++ b/mpeglib/example/yaf/yafcore/inputInterface.h @@ -18,7 +18,7 @@ #include "buffer.h" #include <fstream> -#include <kdemacros.h> +#include <tdemacros.h> extern "C" { #include <unistd.h> diff --git a/mpeglib/example/yaf/yafcore/outputInterface.h b/mpeglib/example/yaf/yafcore/outputInterface.h index fe4c8e71..616c1eb7 100644 --- a/mpeglib/example/yaf/yafcore/outputInterface.h +++ b/mpeglib/example/yaf/yafcore/outputInterface.h @@ -21,7 +21,7 @@ #include <pthread.h> #include <fstream> #include "buffer.h" -#include <kdemacros.h> +#include <tdemacros.h> // uncomment this for debugging the output stream // (written to file outstream.dbg) diff --git a/mpeglib/example/yaf/yafcore/yaf_control.h b/mpeglib/example/yaf/yafcore/yaf_control.h index 630dc398..14cf921f 100644 --- a/mpeglib/example/yaf/yafcore/yaf_control.h +++ b/mpeglib/example/yaf/yafcore/yaf_control.h @@ -13,7 +13,7 @@ #include <unistd.h> #include <fcntl.h> #include <stdio.h> -#include <kdemacros.h> +#include <tdemacros.h> // prototypes diff --git a/mpeglib/example/yaf/yafxplayer/inputDecoderYAF.h b/mpeglib/example/yaf/yafxplayer/inputDecoderYAF.h index 798c8a62..1abc4452 100644 --- a/mpeglib/example/yaf/yafxplayer/inputDecoderYAF.h +++ b/mpeglib/example/yaf/yafxplayer/inputDecoderYAF.h @@ -20,7 +20,7 @@ #include "inputDecoderXPlayer.h" #include "yafOutputStream.h" -#include <kdemacros.h> +#include <tdemacros.h> class TDE_EXPORT InputDecoderYAF : public InputDecoderXPlayer { diff --git a/mpeglib/example/yaf/yafxplayer/yafOutputStream.h b/mpeglib/example/yaf/yafxplayer/yafOutputStream.h index 25d7978f..70e26974 100644 --- a/mpeglib/example/yaf/yafxplayer/yafOutputStream.h +++ b/mpeglib/example/yaf/yafxplayer/yafOutputStream.h @@ -41,7 +41,7 @@ #include <unistd.h> #include <sys/types.h> #include <sys/socket.h> -#include <kdemacros.h> +#include <tdemacros.h> // If you get compile errors when using mpeglib // simply remove the yaf dependencies diff --git a/mpeglib/lib/decoder/decoderPlugin.h b/mpeglib/lib/decoder/decoderPlugin.h index a25bee60..1737b7b6 100644 --- a/mpeglib/lib/decoder/decoderPlugin.h +++ b/mpeglib/lib/decoder/decoderPlugin.h @@ -26,7 +26,7 @@ #include "../output/outPlugin.h" #include "../util/timeWrapper.h" -#include <kdemacros.h> +#include <tdemacros.h> /** Note: streamstate can be "or'ed" for the waitStreamState call diff --git a/mpeglib/lib/decoder/mpgPlugin.h b/mpeglib/lib/decoder/mpgPlugin.h index d2c57f01..8077ddde 100644 --- a/mpeglib/lib/decoder/mpgPlugin.h +++ b/mpeglib/lib/decoder/mpgPlugin.h @@ -16,7 +16,7 @@ #define __MPGPLUGIN_H #include "../decoder/decoderPlugin.h" -#include <kdemacros.h> +#include <tdemacros.h> #define _INSERT_NO 0 #define _INSERT_VIDEO 1 diff --git a/mpeglib/lib/decoder/nukePlugin.h b/mpeglib/lib/decoder/nukePlugin.h index 9898bd02..7a5a16a3 100644 --- a/mpeglib/lib/decoder/nukePlugin.h +++ b/mpeglib/lib/decoder/nukePlugin.h @@ -16,7 +16,7 @@ #include "../decoder/decoderPlugin.h" -#include <kdemacros.h> +#include <tdemacros.h> class TDE_EXPORT NukePlugin : public DecoderPlugin { diff --git a/mpeglib/lib/decoder/splayPlugin.h b/mpeglib/lib/decoder/splayPlugin.h index 4bb0d9f9..cc230874 100644 --- a/mpeglib/lib/decoder/splayPlugin.h +++ b/mpeglib/lib/decoder/splayPlugin.h @@ -15,7 +15,7 @@ #define __SPLAYPLUGIN_H #include "../decoder/decoderPlugin.h" -#include <kdemacros.h> +#include <tdemacros.h> class SplayDecoder; class MpegAudioFrame; diff --git a/mpeglib/lib/decoder/tplayPlugin.h b/mpeglib/lib/decoder/tplayPlugin.h index 90c6f6d2..530e1e44 100644 --- a/mpeglib/lib/decoder/tplayPlugin.h +++ b/mpeglib/lib/decoder/tplayPlugin.h @@ -15,7 +15,7 @@ #define __TPLAYPLUGIN_H #include "../decoder/decoderPlugin.h" -#include <kdemacros.h> +#include <tdemacros.h> /** The tplayPlugin is ugly and needs a rewrite. Im not sure if you can make mutiple instances of it diff --git a/mpeglib/lib/frame/IOFrameQueue.h b/mpeglib/lib/frame/IOFrameQueue.h index 652977b6..e21f9157 100644 --- a/mpeglib/lib/frame/IOFrameQueue.h +++ b/mpeglib/lib/frame/IOFrameQueue.h @@ -16,7 +16,7 @@ #define __IOFRAMEQUEUE_H #include "frameQueue.h" -#include <kdemacros.h> +#include <tdemacros.h> /** This class can store up to <size> frames. diff --git a/mpeglib/lib/frame/audioFrame.h b/mpeglib/lib/frame/audioFrame.h index 853a5391..c9707326 100644 --- a/mpeglib/lib/frame/audioFrame.h +++ b/mpeglib/lib/frame/audioFrame.h @@ -29,7 +29,7 @@ #include "frame.h" -#include <kdemacros.h> +#include <tdemacros.h> #define SCALFACTOR SHRT_MAX #define MP3FRAMESIZE (2*2*2*32*18) diff --git a/mpeglib/lib/frame/audioFrameQueue.h b/mpeglib/lib/frame/audioFrameQueue.h index 63f8bd57..fe133e68 100644 --- a/mpeglib/lib/frame/audioFrameQueue.h +++ b/mpeglib/lib/frame/audioFrameQueue.h @@ -19,7 +19,7 @@ #include "floatFrame.h" #include "pcmFrame.h" -#include <kdemacros.h> +#include <tdemacros.h> /** This class solves the problem that we produce audioFrames diff --git a/mpeglib/lib/frame/framer.h b/mpeglib/lib/frame/framer.h index 2c1081ba..b90df946 100644 --- a/mpeglib/lib/frame/framer.h +++ b/mpeglib/lib/frame/framer.h @@ -19,7 +19,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <kdemacros.h> +#include <tdemacros.h> #define FRAME_NEED 0 #define FRAME_WORK 1 diff --git a/mpeglib/lib/frame/pcmFrame.h b/mpeglib/lib/frame/pcmFrame.h index f031519f..029f0eab 100644 --- a/mpeglib/lib/frame/pcmFrame.h +++ b/mpeglib/lib/frame/pcmFrame.h @@ -17,7 +17,7 @@ #include "audioFrame.h" -#include <kdemacros.h> +#include <tdemacros.h> // this format has a sampleSize of 16, signed, endian==machine class TDE_EXPORT PCMFrame : public AudioFrame { diff --git a/mpeglib/lib/input/inputPlugin.h b/mpeglib/lib/input/inputPlugin.h index 7ccc5501..f6b65f34 100644 --- a/mpeglib/lib/input/inputPlugin.h +++ b/mpeglib/lib/input/inputPlugin.h @@ -25,7 +25,7 @@ #include <string.h> #include "inputDetector.h" -#include <kdemacros.h> +#include <tdemacros.h> #define _INPUT_THREADSAFE 1 diff --git a/mpeglib/lib/output/outPlugin.h b/mpeglib/lib/output/outPlugin.h index 72b49edf..b606d444 100644 --- a/mpeglib/lib/output/outPlugin.h +++ b/mpeglib/lib/output/outPlugin.h @@ -18,7 +18,7 @@ #include "dspX11OutputStream.h" #include "artsOutputStream.h" #include "threadSafeOutputStream.h" -#include <kdemacros.h> +#include <tdemacros.h> #define _OUTPUT_LOCAL 1 #define _OUTPUT_EMPTY 2 diff --git a/mpeglib/lib/output/outputStream.h b/mpeglib/lib/output/outputStream.h index b2d1a2fb..ae856976 100644 --- a/mpeglib/lib/output/outputStream.h +++ b/mpeglib/lib/output/outputStream.h @@ -20,7 +20,7 @@ #include "pluginInfo.h" #include "../util/render/pictureArray.h" #include "../util/abstract/abs_thread.h" -#include <kdemacros.h> +#include <tdemacros.h> #define _OUTPUT_WAIT_METHOD_BLOCK 1 #define _OUTPUT_WAIT_METHOD_POLL 2 diff --git a/mpeglib/lib/output/pluginInfo.h b/mpeglib/lib/output/pluginInfo.h index 1d9e5409..585ef7ba 100644 --- a/mpeglib/lib/output/pluginInfo.h +++ b/mpeglib/lib/output/pluginInfo.h @@ -16,7 +16,7 @@ #define __PLUGININFO_H #include "../util/dynBuffer.h" -#include <kdemacros.h> +#include <tdemacros.h> /** Here we have the base class for all additional information diff --git a/mpeglib/lib/splay/mpegAudioFrame.h b/mpeglib/lib/splay/mpegAudioFrame.h index 100579fb..911307cd 100644 --- a/mpeglib/lib/splay/mpegAudioFrame.h +++ b/mpeglib/lib/splay/mpegAudioFrame.h @@ -17,7 +17,7 @@ #include "mpegAudioHeader.h" #include "../frame/framer.h" -#include <kdemacros.h> +#include <tdemacros.h> /* Here we are framing from raw to mpeg audio. diff --git a/mpeglib/lib/splay/splayDecoder.h b/mpeglib/lib/splay/splayDecoder.h index 6767336d..d91faa33 100644 --- a/mpeglib/lib/splay/splayDecoder.h +++ b/mpeglib/lib/splay/splayDecoder.h @@ -29,7 +29,7 @@ #include "../frame/audioFrame.h" #include "dump.h" #include <string.h> -#include <kdemacros.h> +#include <tdemacros.h> class Mpegtoraw; class MpegAudioStream; diff --git a/mpeglib/lib/util/audio/dspWrapper.h b/mpeglib/lib/util/audio/dspWrapper.h index 8fc21cdf..6a6fd5be 100644 --- a/mpeglib/lib/util/audio/dspWrapper.h +++ b/mpeglib/lib/util/audio/dspWrapper.h @@ -18,7 +18,7 @@ class AudioFrame; class PCMFrame; class FloatFrame; -#include <kdemacros.h> +#include <tdemacros.h> /** This class wraps the platform specific /dev/dsp implementation. diff --git a/mpeglib/lib/util/timeWrapper.h b/mpeglib/lib/util/timeWrapper.h index f8c2c8a3..435b86db 100644 --- a/mpeglib/lib/util/timeWrapper.h +++ b/mpeglib/lib/util/timeWrapper.h @@ -23,7 +23,7 @@ #include <strings.h> #endif -#include <kdemacros.h> +#include <tdemacros.h> typedef struct timeval_s { long tv_sec; /* seconds */ diff --git a/mpeglib/lib/yuv/yuvPlugin.h b/mpeglib/lib/yuv/yuvPlugin.h index 6cc33d7e..238b01f6 100644 --- a/mpeglib/lib/yuv/yuvPlugin.h +++ b/mpeglib/lib/yuv/yuvPlugin.h @@ -18,7 +18,7 @@ #define __YUVPLUGIN_H #include "../decoder/decoderPlugin.h" -#include <kdemacros.h> +#include <tdemacros.h> class TDE_EXPORT YUVPlugin : public DecoderPlugin { diff --git a/noatun/library/noatun/app.h b/noatun/library/noatun/app.h index 1fc61d9a..6dce85c5 100644 --- a/noatun/library/noatun/app.h +++ b/noatun/library/noatun/app.h @@ -2,7 +2,7 @@ #define NOATUN_H #include <kuniqueapplication.h> -#include <kdemacros.h> +#include <tdemacros.h> class Playlist; class Player; class LibraryLoader; diff --git a/noatun/library/noatun/controls.h b/noatun/library/noatun/controls.h index 020b030b..8648a514 100644 --- a/noatun/library/noatun/controls.h +++ b/noatun/library/noatun/controls.h @@ -7,7 +7,7 @@ #include <tdetoolbar.h> #include <tqslider.h> #include <tqstringlist.h> -#include <kdemacros.h> +#include <tdemacros.h> class TQComboBox; class TQLabel; diff --git a/noatun/library/noatun/engine.h b/noatun/library/noatun/engine.h index d1fdb845..10b73293 100644 --- a/noatun/library/noatun/engine.h +++ b/noatun/library/noatun/engine.h @@ -5,7 +5,7 @@ #include <kurl.h> #include <arts/kmedia2.h> #include <noatun/playlist.h> -#include <kdemacros.h> +#include <tdemacros.h> class Visualization; namespace Arts diff --git a/noatun/library/noatun/player.h b/noatun/library/noatun/player.h index 77c24a8f..a5022269 100644 --- a/noatun/library/noatun/player.h +++ b/noatun/library/noatun/player.h @@ -5,7 +5,7 @@ #include <tqtimer.h> #include <kurl.h> #include <noatun/playlist.h> -#include <kdemacros.h> +#include <tdemacros.h> class Engine; class Playlist; class KLibrary; diff --git a/noatun/library/noatun/playlist.h b/noatun/library/noatun/playlist.h index b6521389..4a8ebeb4 100644 --- a/noatun/library/noatun/playlist.h +++ b/noatun/library/noatun/playlist.h @@ -6,7 +6,7 @@ #include <tqdict.h> #include <tqstringlist.h> #include <cassert> -#include <kdemacros.h> +#include <tdemacros.h> class PlaylistItem; diff --git a/noatun/library/noatun/plugin.h b/noatun/library/noatun/plugin.h index 504d2ec3..e42ec136 100644 --- a/noatun/library/noatun/plugin.h +++ b/noatun/library/noatun/plugin.h @@ -4,7 +4,7 @@ #include <noatun/pluginloader.h> #include <tqmemarray.h> #include <vector> -#include <kdemacros.h> +#include <tdemacros.h> namespace Noatun { class FFTScopeStereo; class FFTScope; class RawScope; class RawScopeStereo; class StereoEffectStack; diff --git a/noatun/library/noatun/pluginloader.h b/noatun/library/noatun/pluginloader.h index 1bbb7369..c6341a75 100644 --- a/noatun/library/noatun/pluginloader.h +++ b/noatun/library/noatun/pluginloader.h @@ -8,7 +8,7 @@ #include <klibloader.h> #include <tqdict.h> -#include <kdemacros.h> +#include <tdemacros.h> struct NoatunLibraryInfo { diff --git a/noatun/library/noatun/pref.h b/noatun/library/noatun/pref.h index 979dd57a..58780594 100644 --- a/noatun/library/noatun/pref.h +++ b/noatun/library/noatun/pref.h @@ -3,7 +3,7 @@ #include <kdialogbase.h> #include <tqptrlist.h> -#include <kdemacros.h> +#include <tdemacros.h> class CModule; diff --git a/noatun/library/noatun/stdaction.h b/noatun/library/noatun/stdaction.h index ff918de5..af3cec69 100644 --- a/noatun/library/noatun/stdaction.h +++ b/noatun/library/noatun/stdaction.h @@ -3,7 +3,7 @@ #include <tdeaction.h> #include <tdeactionclasses.h> -#include <kdemacros.h> +#include <tdemacros.h> class TDEPopupMenu; /** diff --git a/noatun/library/noatun/vequalizer.h b/noatun/library/noatun/vequalizer.h index 2eff3715..54599973 100644 --- a/noatun/library/noatun/vequalizer.h +++ b/noatun/library/noatun/vequalizer.h @@ -42,7 +42,7 @@ #include <tqptrlist.h> #include <tqobject.h> #include <kurl.h> -#include <kdemacros.h> +#include <tdemacros.h> class VBand; /** diff --git a/noatun/modules/dcopiface/dcopiface.h b/noatun/modules/dcopiface/dcopiface.h index 38767fc4..05afd019 100644 --- a/noatun/modules/dcopiface/dcopiface.h +++ b/noatun/modules/dcopiface/dcopiface.h @@ -5,7 +5,7 @@ #include <noatun/plugin.h> #include <dcopobject.h> -#include <kdemacros.h> +#include <tdemacros.h> class TDE_EXPORT NIF : public Plugin, public DCOPObject { diff --git a/tdeioslave/audiocd/audiocd.cpp b/tdeioslave/audiocd/audiocd.cpp index 8d477987..71eba0e2 100644 --- a/tdeioslave/audiocd/audiocd.cpp +++ b/tdeioslave/audiocd/audiocd.cpp @@ -30,7 +30,7 @@ extern "C" #include <cdda_paranoia.h> void paranoiaCallback(long, int); - #include <kdemacros.h> + #include <tdemacros.h> TDE_EXPORT int kdemain(int argc, char ** argv); } |