diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2009-09-12 07:48:09 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2009-09-12 07:48:09 +0000 |
| commit | 7fdbda0ffa12159ac7c5f265287540fc5bae71a9 (patch) | |
| tree | 68d13795023b299895f29faf0cd563dd0c4048de /src/ui | |
| parent | 4ba01707e9910f20e73fcca2e5fbda718d5fb885 (diff) | |
| download | qmmp-7fdbda0ffa12159ac7c5f265287540fc5bae71a9.tar.gz qmmp-7fdbda0ffa12159ac7c5f265287540fc5bae71a9.tar.bz2 qmmp-7fdbda0ffa12159ac7c5f265287540fc5bae71a9.zip | |
added getcwd portability patch (Pino Toskano)
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1200 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/mainwindow.cpp | 3 | ||||
| -rw-r--r-- | src/ui/qmmpstarter.cpp | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp index 3f3ee5752..7ac0461d2 100644 --- a/src/ui/mainwindow.cpp +++ b/src/ui/mainwindow.cpp @@ -148,8 +148,7 @@ MainWindow::MainWindow(const QStringList& args, BuiltinCommandLineOption* option m_playListModel->doCurrentVisibleRequest(); updateEQ(); #ifndef Q_OS_WIN32 - char buf[PATH_MAX + 1]; - QString cwd = QString::fromLocal8Bit(getcwd(buf,PATH_MAX)); + QString cwd = QDir::currentPath(); processCommandArgs(args,cwd); #endif if (m_startHidden && m_generalHandler->visibilityControl()) diff --git a/src/ui/qmmpstarter.cpp b/src/ui/qmmpstarter.cpp index 462329bb5..d0c126ba4 100644 --- a/src/ui/qmmpstarter.cpp +++ b/src/ui/qmmpstarter.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006 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 * @@ -19,8 +19,7 @@ ***************************************************************************/ #include <QApplication> -#include <QLocalServer> -#include <QLocalSocket> +#include <QDir> #include <cstdlib> #include <iostream> @@ -115,8 +114,7 @@ void QMMPStarter::writeCommand() #ifndef Q_OS_WIN32 if (!argString.isEmpty()) { - char buf[PATH_MAX + 1]; - QString workingDir = QString::fromLocal8Bit(getcwd(buf,PATH_MAX)) + "\n"; + QString workingDir = QDir::currentPath() + "\n"; QByteArray barray; barray.append(workingDir.toUtf8 ()); |