Commit f2122774 authored by Thomas Eschenbacher's avatar Thomas Eschenbacher

coding style / indent / whitespace fixes

after commit 23a21c69
(use Q_DECLARE_OVERRIDE)
parent 6f0f419b
......@@ -119,7 +119,8 @@ namespace Kwave
* @param view the signal view, must not be a null pointer
* @param controls a widget with controls, optionally, can be null
*/
void insertView(Kwave::SignalView *view, QWidget *controls) Q_DECL_OVERRIDE;
void insertView(Kwave::SignalView *view, QWidget *controls)
Q_DECL_OVERRIDE;
signals:
......
......@@ -67,7 +67,8 @@ namespace Kwave
* @param zoom the new zoom factor in pixels/sample
* @param offset the index of the first visible sample
*/
void setZoomAndOffset(double zoom, sample_index_t offset) Q_DECL_OVERRIDE;
void setZoomAndOffset(double zoom, sample_index_t offset)
Q_DECL_OVERRIDE;
/**
* sets new vertical zoom factor
......@@ -96,7 +97,8 @@ namespace Kwave
* @return the nearest ViewObject in range
* or a null pointer if nothing found
*/
QSharedPointer<Kwave::ViewItem> findItem(const QPoint &pos) Q_DECL_OVERRIDE;
QSharedPointer<Kwave::ViewItem> findItem(const QPoint &pos)
Q_DECL_OVERRIDE;
/**
* Called when the context menu has been activated over this view
......
......@@ -89,7 +89,8 @@ namespace Kwave
inline bool isCanceled() const { return m_canceled; }
/** @see QList::insert() */
bool insert(unsigned int track, Kwave::SampleReader *reader) Q_DECL_OVERRIDE;
bool insert(unsigned int track, Kwave::SampleReader *reader)
Q_DECL_OVERRIDE;
/** Skips a number of samples. */
virtual void skip(sample_index_t count);
......
......@@ -112,7 +112,9 @@ namespace Kwave
}
/** @see the Kwave::MultiTrackSource.at()... */
inline virtual SOURCE * operator [] (unsigned int track) Q_DECL_OVERRIDE {
inline virtual SOURCE * operator [] (unsigned int track)
Q_DECL_OVERRIDE
{
return at(track);
}
......
......@@ -72,7 +72,8 @@ namespace Kwave
* will be internally set to zero if successful
* @return true if successful, false if failed (e.g. out of memory)
*/
bool write(const Kwave::SampleArray &buffer, unsigned int &count) Q_DECL_OVERRIDE;
bool write(const Kwave::SampleArray &buffer, unsigned int &count)
Q_DECL_OVERRIDE;
private:
......
......@@ -76,7 +76,7 @@ namespace Kwave
* @param track index of the track
*/
Kwave::StreamObject *port(const char *port,
unsigned int track) Q_DECL_OVERRIDE;
unsigned int track) Q_DECL_OVERRIDE;
/** does nothing, work is done automatically in mix() */
void goOn() Q_DECL_OVERRIDE
......
......@@ -66,7 +66,7 @@ namespace Kwave
/** @see UndoAction::undo() */
Kwave::UndoAction *undo(Kwave::SignalManager &manager,
bool with_redo) Q_DECL_OVERRIDE;
bool with_redo) Q_DECL_OVERRIDE;
protected:
......
......@@ -76,7 +76,7 @@ namespace Kwave
* @see UndoAction::undo()
*/
Kwave::UndoAction *undo(Kwave::SignalManager &manager,
bool with_redo) Q_DECL_OVERRIDE;
bool with_redo) Q_DECL_OVERRIDE;
/** dump, for debugging purposes */
void dump(const QString &indent) Q_DECL_OVERRIDE;
......
......@@ -66,7 +66,7 @@ namespace Kwave
/** @see UndoAction::undo() */
Kwave::UndoAction *undo(Kwave::SignalManager &manager,
bool with_redo) Q_DECL_OVERRIDE;
bool with_redo) Q_DECL_OVERRIDE;
protected:
......
......@@ -71,7 +71,7 @@ namespace Kwave
* @see UndoAction::undo()
*/
Kwave::UndoAction *undo(Kwave::SignalManager &manager,
bool with_redo) Q_DECL_OVERRIDE;
bool with_redo) Q_DECL_OVERRIDE;
/** dump, for debugging purposes */
void dump(const QString &indent) Q_DECL_OVERRIDE;
......
......@@ -64,7 +64,7 @@ namespace Kwave
/** @see UndoAction::undo() */
Kwave::UndoAction *undo(Kwave::SignalManager &manager,
bool with_redo) Q_DECL_OVERRIDE;
bool with_redo) Q_DECL_OVERRIDE;
protected:
......
......@@ -66,7 +66,8 @@ namespace Kwave
* require any extra memory for redo.
* @see UndoAction::undo()
*/
UndoAction *undo(Kwave::SignalManager &manager, bool with_redo) Q_DECL_OVERRIDE;
UndoAction *undo(Kwave::SignalManager &manager, bool with_redo)
Q_DECL_OVERRIDE;
protected:
......
......@@ -72,7 +72,7 @@ namespace Kwave
* @param force if true, even update if no settings have changed
*/
void updateFilter(Kwave::SampleSource *filter,
bool force = false) Q_DECL_OVERRIDE;
bool force = false) Q_DECL_OVERRIDE;
/**
* Returns a verbose name of the performed action. Used for giving
......
......@@ -54,8 +54,8 @@ namespace Kwave
* @return true if succeeded, false on errors
*/
bool encode(QWidget *widget, Kwave::MultiTrackReader &src,
QIODevice &dst,
const Kwave::MetaDataList &meta_data) Q_DECL_OVERRIDE;
QIODevice &dst,
const Kwave::MetaDataList &meta_data) Q_DECL_OVERRIDE;
/** Returns a list of supported file properties */
QList<Kwave::FileProperty> supportedProperties() Q_DECL_OVERRIDE;
......
......@@ -120,14 +120,16 @@ namespace Kwave
*
* @param metadata the FLAC meta data to be parsed
*/
void metadata_callback(const ::FLAC__StreamMetadata *metadata) Q_DECL_OVERRIDE;
void metadata_callback(const ::FLAC__StreamMetadata *metadata)
Q_DECL_OVERRIDE;
/**
* FLAC decoder interface: error callback.
*
* @param status the FLAC status
*/
void error_callback(::FLAC__StreamDecoderErrorStatus status) Q_DECL_OVERRIDE;
void error_callback(::FLAC__StreamDecoderErrorStatus status)
Q_DECL_OVERRIDE;
private:
......
......@@ -63,8 +63,8 @@ namespace Kwave
* @return true if succeeded, false on errors
*/
bool encode(QWidget *widget, Kwave::MultiTrackReader &src,
QIODevice &dst,
const Kwave::MetaDataList &meta_data) Q_DECL_OVERRIDE;
QIODevice &dst,
const Kwave::MetaDataList &meta_data) Q_DECL_OVERRIDE;
/** Returns a list of supported file properties */
QList<Kwave::FileProperty> supportedProperties() Q_DECL_OVERRIDE;
......@@ -90,7 +90,8 @@ namespace Kwave
* @param metadata pointer to a FLAC metadata structure that will
* be filled
*/
void metadata_callback(const ::FLAC__StreamMetadata *metadata) Q_DECL_OVERRIDE;
void metadata_callback(const ::FLAC__StreamMetadata *metadata)
Q_DECL_OVERRIDE;
/**
* Encode all Kwave file info into FLAC meta data
......
......@@ -53,9 +53,9 @@ namespace Kwave
* @return true if succeeded, false on errors
*/
bool encode(QWidget *widget,
Kwave::MultiTrackReader &src,
QIODevice &dst,
const Kwave::MetaDataList &meta_data) Q_DECL_OVERRIDE;
Kwave::MultiTrackReader &src,
QIODevice &dst,
const Kwave::MetaDataList &meta_data) Q_DECL_OVERRIDE;
/** Returns a list of supported file properties */
QList<Kwave::FileProperty> supportedProperties() Q_DECL_OVERRIDE;
......
......@@ -64,8 +64,8 @@ namespace Kwave
* @return true if succeeded, false if failed
*/
bool open(QWidget *widget,
const Kwave::FileInfo &info,
Kwave::MultiTrackReader &src) Q_DECL_OVERRIDE;
const Kwave::FileInfo &info,
Kwave::MultiTrackReader &src) Q_DECL_OVERRIDE;
/**
* write the header information
......@@ -81,7 +81,7 @@ namespace Kwave
* @return true if succeeded, false if failed
*/
bool encode(Kwave::MultiTrackReader &src,
QIODevice &dst) Q_DECL_OVERRIDE;
QIODevice &dst) Q_DECL_OVERRIDE;
/**
* finished the encoding, clean up
......
......@@ -56,8 +56,8 @@ namespace Kwave
* @return true if succeeded, false if failed
*/
bool open(QWidget *widget,
const Kwave::FileInfo &info,
Kwave::MultiTrackReader &src) Q_DECL_OVERRIDE;
const Kwave::FileInfo &info,
Kwave::MultiTrackReader &src) Q_DECL_OVERRIDE;
/**
* write the header information
......@@ -73,7 +73,7 @@ namespace Kwave
* @return true if succeeded, false if failed
*/
bool encode(Kwave::MultiTrackReader &src,
QIODevice &dst) Q_DECL_OVERRIDE;
QIODevice &dst) Q_DECL_OVERRIDE;
/**
* finished the encoding, clean up
......
......@@ -41,7 +41,8 @@ namespace Kwave
virtual ~RecoveryBuffer() {}
/** implementation of RecoverySource::read */
qint64 read(quint64 offset, char *data, unsigned int bytes) Q_DECL_OVERRIDE;
qint64 read(quint64 offset, char *data, unsigned int bytes)
Q_DECL_OVERRIDE;
private:
......
......@@ -43,7 +43,8 @@ namespace Kwave
virtual ~RecoveryMapping() {}
/** implementation of Recoverysource::read */
qint64 read(quint64 offset, char *data, unsigned int bytes) Q_DECL_OVERRIDE;
qint64 read(quint64 offset, char *data, unsigned int bytes)
Q_DECL_OVERRIDE;
private:
......
......@@ -56,7 +56,8 @@ namespace Kwave
* @return true if succeeded, false on errors
*/
bool encode(QWidget *widget, Kwave::MultiTrackReader &src,
QIODevice &dst, const Kwave::MetaDataList &meta_data) Q_DECL_OVERRIDE;
QIODevice &dst, const Kwave::MetaDataList &meta_data)
Q_DECL_OVERRIDE;
/** Returns a list of supported file properties */
QList<Kwave::FileProperty> supportedProperties() Q_DECL_OVERRIDE;
......
......@@ -75,7 +75,7 @@ namespace Kwave
* @param force if true, even update if no settings have changed
*/
void updateFilter(Kwave::SampleSource *filter,
bool force = false) Q_DECL_OVERRIDE;
bool force = false) Q_DECL_OVERRIDE;
/**
* Returns a verbose name of the performed action. Used for giving
......
......@@ -65,7 +65,7 @@ namespace Kwave
* @param force if true, even update if no settings have changed
*/
void updateFilter(Kwave::SampleSource *filter,
bool force = false) Q_DECL_OVERRIDE;
bool force = false) Q_DECL_OVERRIDE;
/**
* Returns a verbose name of the performed action. Used for giving
......
......@@ -73,7 +73,7 @@ namespace Kwave
* @param force if true, even update if no settings have changed
*/
void updateFilter(Kwave::SampleSource *filter,
bool force = false) Q_DECL_OVERRIDE;
bool force = false) Q_DECL_OVERRIDE;
/**
* Returns a verbose name of the performed action. Used for giving
......
......@@ -73,7 +73,7 @@ namespace Kwave
* @param force if true, even update if no settings have changed
*/
void updateFilter(Kwave::SampleSource *filter,
bool force = false) Q_DECL_OVERRIDE;
bool force = false) Q_DECL_OVERRIDE;
/**
* Returns a verbose name of the performed action. Used for giving
......
......@@ -57,8 +57,8 @@ namespace Kwave
* @see PlayBackDevice::open
*/
QString open(const QString &device, double rate,
unsigned int channels, unsigned int bits,
unsigned int bufbase) Q_DECL_OVERRIDE;
unsigned int channels, unsigned int bits,
unsigned int bufbase) Q_DECL_OVERRIDE;
/**
* Writes an array of samples to the output device.
......@@ -85,7 +85,8 @@ namespace Kwave
* @param device filename of the device
* @return list of supported bits per sample, or empty on errors
*/
QList<unsigned int> supportedBits(const QString &device) Q_DECL_OVERRIDE;
QList<unsigned int> supportedBits(const QString &device)
Q_DECL_OVERRIDE;
/**
* Detect the minimum and maximum number of channels.
......@@ -98,7 +99,8 @@ namespace Kwave
* negative error number if failed
*/
int detectChannels(const QString &device,
unsigned int &min, unsigned int &max) Q_DECL_OVERRIDE;
unsigned int &min, unsigned int &max)
Q_DECL_OVERRIDE;
protected:
......
......@@ -49,8 +49,8 @@ namespace Kwave
* @see PlayBackDevice::open
*/
QString open(const QString &device, double rate,
unsigned int channels, unsigned int bits,
unsigned int bufbase) Q_DECL_OVERRIDE;
unsigned int channels, unsigned int bits,
unsigned int bufbase) Q_DECL_OVERRIDE;
/**
* Writes an array of samples to the output device.
......@@ -77,7 +77,8 @@ namespace Kwave
* @param device filename of the device
* @return list of supported bits per sample, or empty on errors
*/
QList<unsigned int> supportedBits(const QString &device) Q_DECL_OVERRIDE;
QList<unsigned int> supportedBits(const QString &device)
Q_DECL_OVERRIDE;
/**
* Detect the minimum and maximum number of channels.
......@@ -90,7 +91,8 @@ namespace Kwave
* negative error number if failed
*/
int detectChannels(const QString &device,
unsigned int &min, unsigned int &max) Q_DECL_OVERRIDE;
unsigned int &min, unsigned int &max)
Q_DECL_OVERRIDE;
protected:
......
......@@ -64,8 +64,8 @@ namespace Kwave
* @see PlayBackDevice::open
*/
QString open(const QString &device, double rate,
unsigned int channels, unsigned int bits,
unsigned int bufbase) Q_DECL_OVERRIDE;
unsigned int channels, unsigned int bits,
unsigned int bufbase) Q_DECL_OVERRIDE;
/**
* Writes an array of samples to the output device.
......@@ -92,7 +92,8 @@ namespace Kwave
* @param device filename of the device
* @return list of supported bits per sample, or empty on errors
*/
QList<unsigned int> supportedBits(const QString &device) Q_DECL_OVERRIDE;
QList<unsigned int> supportedBits(const QString &device)
Q_DECL_OVERRIDE;
/**
* Detect the minimum and maximum number of channels.
......@@ -105,7 +106,8 @@ namespace Kwave
* negative error number if failed
*/
int detectChannels(const QString &device,
unsigned int &min, unsigned int &max) Q_DECL_OVERRIDE;
unsigned int &min, unsigned int &max)
Q_DECL_OVERRIDE;
/**
* our own poll function, for timeout support
......
......@@ -61,8 +61,8 @@ namespace Kwave
* @see PlayBackDevice::open
*/
QString open(const QString &device, double rate,
unsigned int channels, unsigned int bits,
unsigned int bufbase) Q_DECL_OVERRIDE;
unsigned int channels, unsigned int bits,
unsigned int bufbase) Q_DECL_OVERRIDE;
/**
* Writes an array of samples to the output device.
......@@ -89,7 +89,8 @@ namespace Kwave
* @param device filename of the device
* @return list of supported bits per sample, or empty on errors
*/
QList<unsigned int> supportedBits(const QString &device) Q_DECL_OVERRIDE;
QList<unsigned int> supportedBits(const QString &device)
Q_DECL_OVERRIDE;
/**
* Detect the minimum and maximum number of channels.
......@@ -101,7 +102,8 @@ namespace Kwave
* @return zero or positive number if ok, negative error number if failed
*/
int detectChannels(const QString &device,
unsigned int &min, unsigned int &max) Q_DECL_OVERRIDE;
unsigned int &min, unsigned int &max)
Q_DECL_OVERRIDE;
private slots:
......
......@@ -101,7 +101,8 @@ namespace Kwave
* @param method a playback_method_t (aRts, ALSA, OSS...)
* @return a new PlayBackDevice or 0 if failed
*/
Kwave::PlayBackDevice *createDevice(Kwave::playback_method_t method) Q_DECL_OVERRIDE;
Kwave::PlayBackDevice *createDevice(Kwave::playback_method_t method)
Q_DECL_OVERRIDE;
/**
* Returns a list of supported playback methods.
......
......@@ -127,7 +127,8 @@ namespace Kwave
* @return zero on success, negative error code if failed
* @see class Compression
*/
int setCompression(Kwave::Compression::Type new_compression) Q_DECL_OVERRIDE;
int setCompression(Kwave::Compression::Type new_compression)
Q_DECL_OVERRIDE;
/** Returns the current compression type (0==none) */
Kwave::Compression::Type compression() Q_DECL_OVERRIDE;
......@@ -155,7 +156,8 @@ namespace Kwave
* Gets a list of supported sample formats.
* @note this depends on the current setting of the compression!
*/
QList<Kwave::SampleFormat::Format> detectSampleFormats() Q_DECL_OVERRIDE;
QList<Kwave::SampleFormat::Format> detectSampleFormats()
Q_DECL_OVERRIDE;
/**
* Try to set a new sample format (signed/unsigned)
......@@ -163,7 +165,8 @@ namespace Kwave
* @return zero on success, negative error code if failed
* @see class SampleFormat
*/
int setSampleFormat(Kwave::SampleFormat::Format new_format) Q_DECL_OVERRIDE;
int setSampleFormat(Kwave::SampleFormat::Format new_format)
Q_DECL_OVERRIDE;
/** Returns the current sample format (signed/unsigned) */
Kwave::SampleFormat::Format sampleFormat() Q_DECL_OVERRIDE;
......
......@@ -113,7 +113,8 @@ namespace Kwave
* @return zero on success, negative error code if failed
* @see class Compression
*/
int setCompression(Kwave::Compression::Type new_compression) Q_DECL_OVERRIDE;
int setCompression(Kwave::Compression::Type new_compression)
Q_DECL_OVERRIDE;
/** Returns the current compression type (0==none) */
Kwave::Compression::Type compression() Q_DECL_OVERRIDE;
......@@ -141,7 +142,8 @@ namespace Kwave
* Gets a list of supported sample formats.
* @note this depends on the current setting of the compression!
*/
QList<Kwave::SampleFormat::Format> detectSampleFormats() Q_DECL_OVERRIDE;
QList<Kwave::SampleFormat::Format> detectSampleFormats()
Q_DECL_OVERRIDE;
/**
* Try to set a new sample format (signed/unsigned)
......@@ -149,7 +151,8 @@ namespace Kwave
* @return zero on success, negative error code if failed
* @see class SampleFormat
*/
int setSampleFormat(Kwave::SampleFormat::Format new_format) Q_DECL_OVERRIDE;
int setSampleFormat(Kwave::SampleFormat::Format new_format)
Q_DECL_OVERRIDE;
/** Returns the current sample format (signed/unsigned) */
Kwave::SampleFormat::Format sampleFormat() Q_DECL_OVERRIDE;
......
......@@ -79,13 +79,15 @@ namespace Kwave
* @return zero on success, negative error code if failed
* @see class SampleFormat
*/
int setSampleFormat(Kwave::SampleFormat::Format new_format) Q_DECL_OVERRIDE;
int setSampleFormat(Kwave::SampleFormat::Format new_format)
Q_DECL_OVERRIDE;
/**
* Gets a list of supported sample formats.
* @note this depends on the current setting of the compression!
*/
QList<Kwave::SampleFormat::Format> detectSampleFormats() Q_DECL_OVERRIDE;
QList<Kwave::SampleFormat::Format> detectSampleFormats()
Q_DECL_OVERRIDE;
/**
* Returns the current resolution in bits per sample or a negative
......@@ -116,7 +118,8 @@ namespace Kwave
* @return zero on success, negative error code if failed
* @see class Compression
*/
int setCompression(Kwave::Compression::Type new_compression) Q_DECL_OVERRIDE;
int setCompression(Kwave::Compression::Type new_compression)
Q_DECL_OVERRIDE;
/**
* Gets a list of supported compression types. If no compression is
......
......@@ -77,13 +77,15 @@ namespace Kwave
* @return zero on success, negative error code if failed
* @see class SampleFormat
*/
int setSampleFormat(Kwave::SampleFormat::Format new_format) Q_DECL_OVERRIDE;
int setSampleFormat(Kwave::SampleFormat::Format new_format)
Q_DECL_OVERRIDE;
/**
* Gets a list of supported sample formats.
* @note this depends on the current setting of the compression!
*/
QList<Kwave::SampleFormat::Format> detectSampleFormats() Q_DECL_OVERRIDE;
QList<Kwave::SampleFormat::Format> detectSampleFormats()
Q_DECL_OVERRIDE;
/**
* Returns the current resolution in bits per sample or a negative
......@@ -114,7 +116,8 @@ namespace Kwave
* @return zero on success, negative error code if failed
* @see class Compression
*/
int setCompression(Kwave::Compression::Type new_compression) Q_DECL_OVERRIDE;
int setCompression(Kwave::Compression::Type new_compression)
Q_DECL_OVERRIDE;
/**
* Gets a list of supported compression types. If no compression is
......@@ -155,7 +158,7 @@ namespace Kwave
* If the detection fails, minimum and maximum are set to zero.
* @param min receives the lowest supported number of tracks
* @param max receives the highest supported number of tracks
* @return zero or positive number if ok, negative error number if failed
* @return zero or positive if ok, negative error number if failed
*/
int detectTracks(unsigned int& min, unsigned int& max) Q_DECL_OVERRIDE;
......
......@@ -77,7 +77,8 @@ namespace Kwave
* undo/redo. You have to check for this when deleting an
* UndoAction object after undo.
*/
UndoAction *undo(Kwave::SignalManager &manager, bool with_redo) Q_DECL_OVERRIDE;
UndoAction *undo(Kwave::SignalManager &manager, bool with_redo)
Q_DECL_OVERRIDE;
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