aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/General
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/General')
-rw-r--r--src/plugins/General/history/history.cpp2
-rw-r--r--src/plugins/General/history/history.h4
-rw-r--r--src/plugins/General/history/historyfactory.cpp2
3 files changed, 3 insertions, 5 deletions
diff --git a/src/plugins/General/history/history.cpp b/src/plugins/General/history/history.cpp
index 2afe21c7d..0f0c4249f 100644
--- a/src/plugins/General/history/history.cpp
+++ b/src/plugins/General/history/history.cpp
@@ -31,9 +31,7 @@
History::History(QObject *parent) : QObject(parent)
{
- m_core = SoundCore::instance();
m_previousState = Qmmp::Stopped;
- m_elapsed = 0;
connect(m_core, SIGNAL(trackInfoChanged()), SLOT(onTrackInfoChanged()));
connect(m_core, SIGNAL(stateChanged(Qmmp::State)), SLOT(onStateChanged(Qmmp::State)));
diff --git a/src/plugins/General/history/history.h b/src/plugins/General/history/history.h
index 91c86004a..6075b8f17 100644
--- a/src/plugins/General/history/history.h
+++ b/src/plugins/General/history/history.h
@@ -51,8 +51,8 @@ private:
SoundCore *m_core;
TrackInfo m_trackInfo;
QElapsedTimer m_time;
- Qmmp::State m_previousState;
- quint64 m_elapsed;
+ Qmmp::State m_previousState = Qmmp::Stopped;
+ quint64 m_elapsed = 0;
QPointer<HistoryWindow> m_historyWindow;
};
diff --git a/src/plugins/General/history/historyfactory.cpp b/src/plugins/General/history/historyfactory.cpp
index ddd572de1..7f5bf82ab 100644
--- a/src/plugins/General/history/historyfactory.cpp
+++ b/src/plugins/General/history/historyfactory.cpp
@@ -56,5 +56,5 @@ void HistoryFactory::showAbout(QWidget *parent)
QString HistoryFactory::translation() const
{
- return QString(":/history_plugin_");
+ return QLatin1String(":/history_plugin_");
}