refactoring

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

4 files changed, 6 insertions, 6 deletions

diff --git a/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp b/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp
index 79d2b64bd..96a26b9aa 100644
--- a/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp
+++ b/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp
@@ -71,7 +71,7 @@ QString StatusOption::executeCommand(const QString &opt_str, const QStringList &
             out += "TRACK = %n\n";
             out += "FILE = %f";
             MetaDataFormatter formatter(out);
-            out = formatter.format(&core->trackInfo());
+            out = formatter.format(core->trackInfo());
         }
         out += "\n";
     }
@@ -79,7 +79,7 @@ QString StatusOption::executeCommand(const QString &opt_str, const QStringList &
     {
         QString t = args.join(" ");
         MetaDataFormatter formatter(t);
-        out = formatter.format(&core->trackInfo());
+        out = formatter.format(core->trackInfo());
         out += "\n";
     }
     else if(opt_str == "--nowplaying-syntax")
diff --git a/src/plugins/Effect/filewriter/filewriterplugin.cpp b/src/plugins/Effect/filewriter/filewriterplugin.cpp
index ecc0d1ba7..e60047ac1 100644
--- a/src/plugins/Effect/filewriter/filewriterplugin.cpp
+++ b/src/plugins/Effect/filewriter/filewriterplugin.cpp
@@ -123,7 +123,7 @@ void FileWriterPlugin::init(const TrackInfo &info)
         fileName = info.path().section("/", 1);
 
     MetaDataFormatter formatter(fileName);
-    fileName = formatter.format(&info);
+    fileName = formatter.format(info);
     if(!fileName.endsWith(".ogg", Qt::CaseInsensitive))
         fileName.append(".ogg");
 
diff --git a/src/plugins/General/statusicon/statusicon.cpp b/src/plugins/General/statusicon/statusicon.cpp
index a4b96b7d3..69ed86387 100644
--- a/src/plugins/General/statusicon/statusicon.cpp
+++ b/src/plugins/General/statusicon/statusicon.cpp
@@ -136,7 +136,7 @@ void StatusIcon::showMetaData()
         }
     }
 
-    QString message = m_messageFormatter.format(&info);
+    QString message = m_messageFormatter.format(info);
     if (message.isEmpty())
         message = info.path().section('/',-1);
 
@@ -146,7 +146,7 @@ void StatusIcon::showMetaData()
 
     if(m_showToolTip)
     {
-        message = m_toolTipFormatter.format(&info);
+        message = m_toolTipFormatter.format(info);
         if(message.isEmpty())
             message = info.path().section('/',-1);
         m_tray->setToolTip(message);
diff --git a/src/plugins/Ui/skinned/textscroller.cpp b/src/plugins/Ui/skinned/textscroller.cpp
index 5a22049b5..e6b8cfa7d 100644
--- a/src/plugins/Ui/skinned/textscroller.cpp
+++ b/src/plugins/Ui/skinned/textscroller.cpp
@@ -253,7 +253,7 @@ void TextScroller::processMetaData()
 {
     if(m_core->state() == Qmmp::Playing)
     {
-        m_titleText = m_formater.format(&m_core->trackInfo());
+        m_titleText = m_formater.format(m_core->trackInfo());
         updateText();
     }
 }