gcc-4.3 support

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@610 90c681e8-e032-0410-971d-27865f9a5e38

10 files changed, 25 insertions, 25 deletions

diff --git a/src/plugins/Effect/srconverter/srconverter.cpp b/src/plugins/Effect/srconverter/srconverter.cpp
index 9cfd56361..b8f729da9 100644
--- a/src/plugins/Effect/srconverter/srconverter.cpp
+++ b/src/plugins/Effect/srconverter/srconverter.cpp
@@ -57,7 +57,7 @@ SRConverter::~SRConverter()
     }
 }
 
-const ulong SRConverter::process(char *in_data, const ulong size, char **out_data)
+ulong SRConverter::process(char *in_data, const ulong size, char **out_data)
 {
     if (m_isSrcAlloc)
     {
@@ -114,7 +114,7 @@ void SRConverter::configure(quint32 freq, int chan, int res)
     }
 }
 
-const quint32 SRConverter::sampleRate()
+quint32 SRConverter::sampleRate()
 {
     return m_overSamplingFs;
 }
diff --git a/src/plugins/Effect/srconverter/srconverter.h b/src/plugins/Effect/srconverter/srconverter.h
index f96079868..2258e6594 100644
--- a/src/plugins/Effect/srconverter/srconverter.h
+++ b/src/plugins/Effect/srconverter/srconverter.h
@@ -39,9 +39,9 @@ public:
 
     virtual ~SRConverter();
 
-    const ulong process(char *in_data, const ulong size, char **out_data);
+    ulong process(char *in_data, const ulong size, char **out_data);
     void configure(quint32 freq, int chan, int res);
-    const quint32 sampleRate();
+    quint32 sampleRate();
 
 private:
     void freeSRC();
diff --git a/src/qmmp/effect.cpp b/src/qmmp/effect.cpp
index 63729c339..28814d434 100644
--- a/src/qmmp/effect.cpp
+++ b/src/qmmp/effect.cpp
@@ -40,17 +40,17 @@ void Effect::configure(quint32 freq, int chan, int res)
     m_res = res;
 }
 
-const quint32 Effect::sampleRate()
+quint32 Effect::sampleRate()
 {
     return m_freq;
 }
 
-const int Effect::channels()
+int Effect::channels()
 {
     return m_chan;
 }
 
-const int Effect::bitsPerSample()
+int Effect::bitsPerSample()
 {
     return m_res;
 }
diff --git a/src/qmmp/effect.h b/src/qmmp/effect.h
index dede28f91..20ac73b43 100644
--- a/src/qmmp/effect.h
+++ b/src/qmmp/effect.h
@@ -45,7 +45,7 @@ public:
      * Return value is the size of the output data. Output data size should not be more then \b size.
      * Subclass should implement this function.
      */
-    virtual const ulong process(char *in_data, const ulong size, char **out_data) = 0;
+    virtual ulong process(char *in_data, const ulong size, char **out_data) = 0;
 
     //virtual const ulong process(char *in_data, const ulong size, char *out_data) = 0;
     //virtual bool process(char *in_data, char *out_data, const ulong maxsize, ulong &rbytes, ulong &wbytes) = 0;
@@ -57,19 +57,19 @@ public:
      * Returns samplerate.
      * This function should be reimplemented if subclass changes default samplerate.
      */
-    virtual const quint32 sampleRate();
+    virtual quint32 sampleRate();
 
     /*!
      * Returns channel number.
      * This function should be reimplemented if subclass changes default channel number.
      */
-    virtual const int channels();
+    virtual int channels();
 
     /*!
      * Returns bit depth.
      * This function should be reimplemented if subclass changes default resolution.
      */
-    virtual const int bitsPerSample();
+    virtual int bitsPerSample();
 
 
     static QList<Effect*> create(QObject *parent);
diff --git a/src/qmmp/fileinfo.cpp b/src/qmmp/fileinfo.cpp
index 593b5203c..936fa1464 100644
--- a/src/qmmp/fileinfo.cpp
+++ b/src/qmmp/fileinfo.cpp
@@ -52,7 +52,7 @@ bool FileInfo::operator!=(const FileInfo &info)
     return !operator==(info);
 }
 
-const qint64 FileInfo::length () const
+qint64 FileInfo::length () const
 {
     return m_length;
 }
diff --git a/src/qmmp/fileinfo.h b/src/qmmp/fileinfo.h
index c01ac4306..418d78795 100644
--- a/src/qmmp/fileinfo.h
+++ b/src/qmmp/fileinfo.h
@@ -41,7 +41,7 @@ public:
     bool operator==(const FileInfo &info);
     bool operator!=(const FileInfo &info);
 
-    const qint64 length () const;
+    qint64 length () const;
     const QString metaData (Qmmp::MetaData key) const;
     const QMap<Qmmp::MetaData, QString>  metaData () const;
     bool isEmpty() const;
diff --git a/src/qmmpui/songinfo.cpp b/src/qmmpui/songinfo.cpp
index 15d134723..6760a6ac4 100644
--- a/src/qmmpui/songinfo.cpp
+++ b/src/qmmpui/songinfo.cpp
@@ -120,22 +120,22 @@ const QString SongInfo::fileName () const
     return m_path.section('/',-1);
 }
 
-const uint SongInfo::year () const
+uint SongInfo::year () const
 {
     return m_numValues[YEAR];
 }
 
-const uint SongInfo::track () const
+uint SongInfo::track () const
 {
     return m_numValues[TRACK];
 }
 
-const uint SongInfo::length () const
+uint SongInfo::length () const
 {
     return m_numValues[LENGTH];
 }
 
-const bool SongInfo::isEmpty () const
+bool SongInfo::isEmpty () const
 {
     return m_strValues.isEmpty();
 }
@@ -147,7 +147,7 @@ void SongInfo::clear ()
     m_stream = FALSE;
 }
 
-const bool SongInfo::isStream () const
+bool SongInfo::isStream () const
 {
     return m_stream;
 }
diff --git a/src/qmmpui/songinfo.h b/src/qmmpui/songinfo.h
index af49b0b67..98600f7d3 100644
--- a/src/qmmpui/songinfo.h
+++ b/src/qmmpui/songinfo.h
@@ -62,11 +62,11 @@ public:
     const QString genre () const;
     const QString path () const;
     const QString fileName () const;
-    const uint year () const;
-    const uint track () const;
-    const uint length () const;
-    const bool isEmpty () const;
-    const bool isStream () const;
+    uint year () const;
+    uint track () const;
+    uint length () const;
+    bool isEmpty () const;
+    bool isStream () const;
     void clear();
 
 private:
diff --git a/src/ui/listwidget.cpp b/src/ui/listwidget.cpp
index 7238cb00f..a81a6098c 100644
--- a/src/ui/listwidget.cpp
+++ b/src/ui/listwidget.cpp
@@ -417,7 +417,7 @@ void ListWidget::mouseMoveEvent(QMouseEvent *e)
     if (INVALID_ROW != row)
     {
         SimpleSelection sel = m_model->getSelection(m_pressed_row);
-        if ((sel.m_top == 0 && m_scroll_direction == TOP) && sel.count() > 1 ||
+        if (((sel.m_top == 0 && m_scroll_direction == TOP) && sel.count() > 1) ||
                 (sel.m_bottom == m_model->count() - 1 && m_scroll_direction == DOWN && sel.count() > 1)
            )
             return;
diff --git a/src/ui/skin.h b/src/ui/skin.h
index 0e82aefd6..12b5bff23 100644
--- a/src/ui/skin.h
+++ b/src/ui/skin.h
@@ -68,7 +68,7 @@ public:
      * We need this to check if we have "-" in pixmaps.
      * if no we should draw it manually.
      */
-    const uint getNumCount(void) const
+    uint getNumCount(void) const
     {
         return m_numbers.count();
     }