rgscan: fixed class name

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

7 files changed, 34 insertions, 35 deletions

diff --git a/src/plugins/General/rgscan/rgscan.pro b/src/plugins/General/rgscan/rgscan.pro
index 752e665c2..56ae3471a 100644
--- a/src/plugins/General/rgscan/rgscan.pro
+++ b/src/plugins/General/rgscan/rgscan.pro
@@ -42,14 +42,14 @@ INSTALLS += target
 HEADERS += rgscanfactory.h \
     rgscanhelper.h \
     rgscandialog.h \
-    rgscaner.h \
-    gain_analysis.h
+    gain_analysis.h \
+    rgscanner.h
 
 win32:HEADERS += ../../../../src/qmmpui/general.h
 SOURCES += rgscanfactory.cpp \
     rgscanhelper.cpp \
     rgscandialog.cpp \
-    rgscaner.cpp \
-    gain_analysis.c
+    gain_analysis.c \
+    rgscanner.cpp
 
 FORMS += rgscandialog.ui
diff --git a/src/plugins/General/rgscan/rgscandialog.cpp b/src/plugins/General/rgscan/rgscandialog.cpp
index 57ca145f4..4414c34d8 100644
--- a/src/plugins/General/rgscan/rgscandialog.cpp
+++ b/src/plugins/General/rgscan/rgscandialog.cpp
@@ -25,7 +25,7 @@
 #include <qmmpui/playlisttrack.h>
 #include <qmmpui/metadataformatter.h>
 #include <qmmpui/filedialog.h>
-#include "rgscaner.h"
+#include "rgscanner.h"
 #include "gain_analysis.h"
 #include "rgscandialog.h"
 
@@ -73,7 +73,7 @@ void RGScanDialog::on_calculateButton_clicked()
     for(int i = 0; i < m_ui.tableWidget->rowCount(); ++i)
     {
         QString url = m_ui.tableWidget->item(i, 0)->data(Qt::UserRole).toString();
-        RGScaner *scaner = new RGScaner();
+        RGScanner *scaner = new RGScanner();
 
         if(!scaner->prepare(url))
         {
@@ -96,7 +96,7 @@ void RGScanDialog::onScanFinished(QString url)
     {
         if(url != m_ui.tableWidget->item(i, 0)->data(Qt::UserRole).toString())
             continue;
-        RGScaner *scanner = findScannerByUrl(url);
+        RGScanner *scanner = findScannerByUrl(url);
         if(!scanner)
             qFatal("RGScanDialog: unable to find scanner by URL!");
         m_ui.tableWidget->setItem(i, 2, new QTableWidgetItem(tr("%1 dB").arg(scanner->gain())));
@@ -106,7 +106,7 @@ void RGScanDialog::onScanFinished(QString url)
 
     bool stopped = true;
 
-    foreach (RGScaner *scanner, m_scanners)
+    foreach (RGScanner *scanner, m_scanners)
     {
         if(scanner->isRunning())
             stopped = false;
@@ -154,7 +154,7 @@ void RGScanDialog::stop()
 {
     if(m_scanners.isEmpty())
         return;
-    foreach (RGScaner *scaner, m_scanners)
+    foreach (RGScanner *scaner, m_scanners)
     {
         scaner->stop();
     }
@@ -163,9 +163,9 @@ void RGScanDialog::stop()
     m_scanners.clear();
 }
 
-RGScaner *RGScanDialog::findScannerByUrl(const QString &url)
+RGScanner *RGScanDialog::findScannerByUrl(const QString &url)
 {
-    foreach (RGScaner *scanner, m_scanners)
+    foreach (RGScanner *scanner, m_scanners)
     {
         if(scanner->url() == url)
             return scanner;
diff --git a/src/plugins/General/rgscan/rgscandialog.h b/src/plugins/General/rgscan/rgscandialog.h
index 5db2f2008..eeacbb632 100644
--- a/src/plugins/General/rgscan/rgscandialog.h
+++ b/src/plugins/General/rgscan/rgscandialog.h
@@ -28,7 +28,7 @@
 class QAction;
 class PlayListTrack;
 class ConverterPreset;
-class RGScaner;
+class RGScanner;
 
 /**
     @author Ilya Kotov <forkotov02@hotmail.ru>
@@ -47,9 +47,9 @@ private slots:
 
 private:
     void stop();
-    RGScaner *findScannerByUrl(const QString &url);
+    RGScanner *findScannerByUrl(const QString &url);
     Ui::RGScanDialog m_ui;
-    QList<RGScaner *> m_scanners;
+    QList<RGScanner *> m_scanners;
 };
 
 #endif // RGSCANDIALOG_H
diff --git a/src/plugins/General/rgscan/rgscanhelper.cpp b/src/plugins/General/rgscan/rgscanhelper.cpp
index c668390ca..9e710d1fa 100644
--- a/src/plugins/General/rgscan/rgscanhelper.cpp
+++ b/src/plugins/General/rgscan/rgscanhelper.cpp
@@ -24,7 +24,6 @@
 #include <qmmpui/playlistmanager.h>
 #include <qmmpui/playlistitem.h>
 #include <qmmpui/mediaplayer.h>
-#include "rgscaner.h"
 #include "rgscandialog.h"
 #include "rgscanhelper.h"
 
diff --git a/src/plugins/General/rgscan/rgscanhelper.h b/src/plugins/General/rgscan/rgscanhelper.h
index 230bb95ec..4c0c6893e 100644
--- a/src/plugins/General/rgscan/rgscanhelper.h
+++ b/src/plugins/General/rgscan/rgscanhelper.h
@@ -24,7 +24,7 @@
 #include <qmmp/qmmp.h>
 
 class QAction;
-class RGScaner;
+class RGScanner;
 
 /**
     @author Ilya Kotov <forkotov02@hotmail.ru>
diff --git a/src/plugins/General/rgscan/rgscaner.cpp b/src/plugins/General/rgscan/rgscanner.cpp
index 203a2a7ab..1fed3c83c 100644
--- a/src/plugins/General/rgscan/rgscaner.cpp
+++ b/src/plugins/General/rgscan/rgscanner.cpp
@@ -22,9 +22,9 @@
 #include <math.h>
 #include <qmmp/inputsourcefactory.h>
 #include <qmmp/decoderfactory.h>
-#include "rgscaner.h"
+#include "rgscanner.h"
 
-RGScaner::RGScaner()
+RGScanner::RGScanner()
 {
     m_gain = 0.;
     m_peak = 0.;
@@ -36,7 +36,7 @@ RGScaner::RGScaner()
     m_source = 0;
 }
 
-RGScaner::~RGScaner()
+RGScanner::~RGScanner()
 {
     stop();
     deinit();
@@ -47,7 +47,7 @@ RGScaner::~RGScaner()
     }
 }
 
-bool RGScaner::prepare(const QString &url)
+bool RGScanner::prepare(const QString &url)
 {
     deinit();
     m_url = url;
@@ -98,44 +98,44 @@ bool RGScaner::prepare(const QString &url)
     return true;
 }
 
-void RGScaner::stop()
+void RGScanner::stop()
 {
     m_mutex.lock();
     m_user_stop = true;
     m_mutex.unlock();
 }
 
-bool RGScaner::isRunning()
+bool RGScanner::isRunning()
 {
     return m_is_running;
 }
 
-bool RGScaner::hasValues() const
+bool RGScanner::hasValues() const
 {
     return m_has_values;
 }
 
-double RGScaner::gain() const
+double RGScanner::gain() const
 {
     return m_gain;
 }
 
-double RGScaner::peak() const
+double RGScanner::peak() const
 {
     return m_peak;
 }
 
-QString RGScaner::url() const
+QString RGScanner::url() const
 {
     return m_url;
 }
 
-GainHandle_t *RGScaner::handle()
+GainHandle_t *RGScanner::handle()
 {
     return m_handle;
 }
 
-void RGScaner::run()
+void RGScanner::run()
 {
     if(m_user_stop)
         return;
@@ -299,7 +299,7 @@ void RGScaner::run()
     m_is_running = false;
 }
 
-void RGScaner::deinit()
+void RGScanner::deinit()
 {
     if(m_decoder)
     {
diff --git a/src/plugins/General/rgscan/rgscaner.h b/src/plugins/General/rgscan/rgscanner.h
index 9878389a5..f302ca08b 100644
--- a/src/plugins/General/rgscan/rgscaner.h
+++ b/src/plugins/General/rgscan/rgscanner.h
@@ -18,8 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef RGSCANER_H
-#define RGSCANER_H
+#ifndef RGSCANNER_H
+#define RGSCANNER_H
 
 #include <QRunnable>
 #include <QObject>
@@ -34,12 +34,12 @@
     @author Ilya Kotov <forkotov02@hotmail.ru>
 */
 
-class RGScaner : public QObject, public QRunnable
+class RGScanner : public QObject, public QRunnable
 {
     Q_OBJECT
 public:
-    explicit RGScaner();
-    ~RGScaner();
+    explicit RGScanner();
+    ~RGScanner();
 
     bool prepare(const QString &url);
     void stop();
@@ -68,4 +68,4 @@ private:
 
 };
 
-#endif // RGSCANER_H
+#endif // RGSCANNER_H