From be414b78f082adbfa033e8e662070b771b05e552 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Mon, 2 Feb 2015 12:48:26 +0000 Subject: optimization git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@4714 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/General/statusicon/statusicon.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/plugins/General/statusicon/statusicon.cpp') diff --git a/src/plugins/General/statusicon/statusicon.cpp b/src/plugins/General/statusicon/statusicon.cpp index 9fcbce60d..71ff8df4a 100644 --- a/src/plugins/General/statusicon/statusicon.cpp +++ b/src/plugins/General/statusicon/statusicon.cpp @@ -30,7 +30,6 @@ #include #include #include -#include #include "qmmptrayicon.h" #include "statusicon.h" @@ -48,6 +47,7 @@ StatusIcon::StatusIcon(QObject *parent) : QObject(parent) m_hideToTray = settings.value("hide_on_close", false).toBool(); m_useStandardIcons = settings.value("use_standard_icons",false).toBool(); m_tooltip = settings.value("show_tooltip",true).toBool(); + m_formatter.setPattern("%p%if(%p&%t, - ,)%t"); #ifdef Q_WS_X11 m_tray->showNiceToolTip(m_tooltip); #endif @@ -121,8 +121,7 @@ void StatusIcon::setState(Qmmp::State state) void StatusIcon::showMetaData() { - MetaDataFormatter f("%p%if(%p&%t, - ,)%t"); - QString message = f.format(m_core->metaData()); + QString message = m_formatter.format(m_core->metaData()); if (message.isEmpty()) message = m_core->metaData(Qmmp::URL).section('/',-1); @@ -132,8 +131,7 @@ void StatusIcon::showMetaData() #ifndef Q_WS_X11 if(m_tooltip) { - MetaDataFormatter f("%p%if(%p&%t, - ,)%t"); - QString message = f.parse(m_core->metaData()); + QString message = m_formatter.format(m_core->metaData()); if(message.isEmpty()) message = m_core->metaData(Qmmp::URL).section('/',-1); m_tray->setToolTip(f.parse(m_core->metaData())); -- cgit v1.2.3-13-gbd6f