Commit 4451e1fe authored by Dirk Mueller's avatar Dirk Mueller
Browse files

the usual "daily unbreak compilation"

svn path=/trunk/KDE/kdemultimedia/kioslave/audiocd/; revision=661100
parent ab678b38
......@@ -36,12 +36,12 @@ public:
* @param slave parent that this classes can use to call data() with
* when finished encoding bits.
*/
explicit AudioCDEncoder(KIO::SlaveBase *slave) : ioslave(slave) {};
explicit AudioCDEncoder(KIO::SlaveBase *slave) : ioslave(slave) {}
/**
* Deconstructor.
*/
virtual ~AudioCDEncoder(){};
virtual ~AudioCDEncoder(){}
/**
* Initiallizes the decoder, loading libraries, etc. Encoders
......@@ -117,7 +117,7 @@ public:
* Returns a configure widget for the encoder
*/
virtual QWidget* getConfigureWidget(KConfigSkeleton** manager) const
{ Q_UNUSED(manager); return NULL; };
{ Q_UNUSED(manager); return NULL; }
/**
* Returns the last error message; called when e.g. read() returns -1.
......
......@@ -44,12 +44,12 @@ public:
EncoderLame(KIO::SlaveBase *slave);
~EncoderLame();
virtual QString type() const { return "MP3"; };
virtual QString type() const { return "MP3"; }
virtual bool init();
virtual void loadSettings();
virtual unsigned long size(long time_secs) const;
virtual const char * fileType() const { return "mp3"; };
virtual const char * mimeType() const { return "audio/x-mp3"; };
virtual const char * fileType() const { return "mp3"; }
virtual const char * mimeType() const { return "audio/x-mp3"; }
virtual void fillSongInfo( KCDDB::CDInfo info, int track, const QString &comment );
virtual long readInit(long size);
virtual long read(int16_t * buf, int frames);
......
......@@ -51,11 +51,11 @@ public:
EncoderVorbis(KIO::SlaveBase *slave);
~EncoderVorbis();
virtual QString type() const { return "Ogg Vorbis"; };
virtual QString type() const { return "Ogg Vorbis"; }
virtual bool init();
virtual void loadSettings();
virtual unsigned long size(long time_secs) const;
virtual const char * fileType() const { return "ogg"; };
virtual const char * fileType() const { return "ogg"; }
virtual const char * mimeType() const;
virtual void fillSongInfo( KCDDB::CDInfo info, int track, const QString &comment );
virtual long readInit(long size);
......
......@@ -38,18 +38,18 @@
class EncoderCda : public AudioCDEncoder {
public:
explicit EncoderCda(KIO::SlaveBase *slave) : AudioCDEncoder(slave) {};
~EncoderCda(){};
virtual bool init(){ return true; };
virtual void loadSettings(){};
explicit EncoderCda(KIO::SlaveBase *slave) : AudioCDEncoder(slave) {}
~EncoderCda(){}
virtual bool init(){ return true; }
virtual void loadSettings(){}
virtual unsigned long size(long time_secs) const;
virtual QString type() const { return "CDA"; };
virtual QString type() const { return "CDA"; }
virtual const char * mimeType() const;
virtual const char * fileType() const { return "cda"; };
virtual void fillSongInfo( KCDDB::CDInfo, int, const QString &){};
virtual long readInit(long){ return 0; };
virtual const char * fileType() const { return "cda"; }
virtual void fillSongInfo( KCDDB::CDInfo, int, const QString &){}
virtual long readInit(long){ return 0; }
virtual long read(int16_t * buf, int frames);
virtual long readCleanup(){ return 0; };
virtual long readCleanup(){ return 0; }
private:
class Private;
......
......@@ -37,14 +37,14 @@
class EncoderWav : public EncoderCda {
public:
explicit EncoderWav(KIO::SlaveBase *slave) : EncoderCda(slave) {};
~EncoderWav(){};
virtual bool init(){ return true; };
explicit EncoderWav(KIO::SlaveBase *slave) : EncoderCda(slave) {}
~EncoderWav(){}
virtual bool init(){ return true; }
virtual unsigned long size(long time_secs) const;
virtual QString type() const { return "Wav"; };
virtual const char * fileType() const { return "wav"; };
virtual QString type() const { return "Wav"; }
virtual const char * fileType() const { return "wav"; }
virtual const char * mimeType() const;
virtual void fillSongInfo( KCDDB::CDInfo, int, const QString &){};
virtual void fillSongInfo( KCDDB::CDInfo, int, const QString &){}
virtual long readInit(long size);
private:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment