aboutsummaryrefslogtreecommitdiff
path: root/src/ui/mainwindow.h
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2009-11-16 10:30:10 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2009-11-16 10:30:10 +0000
commita6c5ce46f9ceb52a2b6275c49faaacc1de8c63d0 (patch)
tree738a3041eb49d8426ba37ede257dfe4cf27770a5 /src/ui/mainwindow.h
parent8cd81045d9c56d2c3ec3c21d794d1ba65bbf6c8d (diff)
downloadqmmp-a6c5ce46f9ceb52a2b6275c49faaacc1de8c63d0.tar.gz
qmmp-a6c5ce46f9ceb52a2b6275c49faaacc1de8c63d0.tar.bz2
qmmp-a6c5ce46f9ceb52a2b6275c49faaacc1de8c63d0.zip
fixed command line regression (Closes issue 194)
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1380 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/ui/mainwindow.h')
-rw-r--r--src/ui/mainwindow.h18
1 files changed, 6 insertions, 12 deletions
diff --git a/src/ui/mainwindow.h b/src/ui/mainwindow.h
index 42d3d7d77..2d8b102fc 100644
--- a/src/ui/mainwindow.h
+++ b/src/ui/mainwindow.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2006-2008 by Ilya Kotov *
+ * Copyright (C) 2006-2009 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -21,18 +21,14 @@
#define MAINWINDOW_H
#include <QMainWindow>
-
+#include <QPointer>
#include <qmmp/output.h>
#include <qmmp/decoder.h>
#include <qmmp/decoderfactory.h>
#include <qmmpui/playlistitem.h>
-
#include "display.h"
#include "titlebar.h"
-/**
- @author Ilya Kotov <forkotov02@hotmail.ru>
-*/
class PlayList;
class PlayListManager;
class ConfigDialog;
@@ -44,12 +40,13 @@ class JumpToTrackDialog;
class VisualMenu;
class GeneralHandler;
class MediaPlayer;
-
class QMenu;
class QKeyEvent;
class BuiltinCommandLineOption;
-
+/**
+ @author Ilya Kotov <forkotov02@hotmail.ru>
+*/
class MainWindow : public QMainWindow
{
Q_OBJECT
@@ -111,16 +108,13 @@ private:
MainDisplay *m_display;
PlayList *m_playlist;
PlayListManager *m_pl_manager;
+ QPointer <PlayListModel> m_model;
ConfigDialog *m_confDialog;
int m_preamp;
EqWidget *m_equalizer;
MainVisual *m_vis;
QString m_lastDir;
bool m_update;
- bool m_showMessage;
- int m_messageDelay;
- bool m_paused;
- bool m_showToolTip;
Skin *m_skin;
JumpToTrackDialog* m_jumpDialog;
bool m_hideOnClose, m_startHidden;