From db37033dd5ec69524f611b65cb74ded1141a9ccc Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Fri, 1 Apr 2011 19:18:05 +0000 Subject: some code cleanup git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2142 90c681e8-e032-0410-971d-27865f9a5e38 --- src/ui/mainwindow.cpp | 43 +------------------------------------------ 1 file changed, 1 insertion(+), 42 deletions(-) (limited to 'src/ui/mainwindow.cpp') diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp index f4f7fa4e6..4b9a243fd 100644 --- a/src/ui/mainwindow.cpp +++ b/src/ui/mainwindow.cpp @@ -53,15 +53,13 @@ #define KEY_OFFSET 10000 -MainWindow::MainWindow(const QStringList& args, BuiltinCommandLineOption* option_manager, QWidget *parent) - : QMainWindow(parent) +MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) { #ifdef Q_WS_X11 qDebug("MainWindow: detected wm: %s", qPrintable(WindowSystem::netWindowManagerName())); #endif m_vis = 0; m_update = false; - m_option_manager = option_manager; setWindowIcon(QIcon(":/32x32/qmmp.png")); setWindowFlags(Qt::Window | Qt::FramelessWindowHint | Qt::WindowCloseButtonHint | Qt::WindowSystemMenuHint); @@ -127,14 +125,8 @@ MainWindow::MainWindow(const QStringList& args, BuiltinCommandLineOption* option m_display->setPL(m_playlist); dock->updateDock(); m_pl_manager->currentPlayList()->doCurrentVisibleRequest(); -#ifndef Q_OS_WIN32 - QString cwd = QDir::currentPath(); - processCommandArgs(args,cwd); -#endif if (m_startHidden && m_generalHandler->visibilityControl()) toggleVisibility(); - if(args.isEmpty()) - resume(); } MainWindow::~MainWindow() @@ -575,39 +567,6 @@ void MainWindow::playPause() play(); } -QString MainWindow::processCommandArgs(const QStringList &slist, const QString& cwd) -{ - if(slist.isEmpty()) - return QString(); - QStringList paths; - foreach(QString arg, slist) //detect file/directory paths - { - if(arg.startsWith("-")) - break; - paths.append(arg); - } - if(!paths.isEmpty()) - { - m_option_manager->executeCommand(QString(), paths, cwd, this); //add paths only - return QString(); - } - QHash commands = m_option_manager->splitArgs(slist); - if(commands.isEmpty()) - return QString(); - foreach(QString key, commands.keys()) - { - if(key == "--no-start") - continue; - if (CommandLineManager::hasOption(key)) - return CommandLineManager::executeCommand(key, commands.value(key)); - else if (m_option_manager->identify(key)) - m_option_manager->executeCommand(key, commands.value(key), cwd, this); - else - return QString(); - } - return QString(); -} - void MainWindow::jumpToFile() { if (m_jumpDialog->isHidden()) -- cgit v1.2.3-13-gbd6f