office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-07-17 02:37:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make it possible to open URLs on the command-line again

Browse source 
by removing much cruft and using the shiny new QUrl::fromUserInput(2 args),
but since that requires Qt 5.4, also include a copy here if Qt is too "old".

Reviewed-By: Albert
Makes-Happy: Lukas
This commit is contained in:
David Faure 2014-09-11 18:26:10 +02:00
parent e28dbc6c00
commit d98b4d9200
1 changed files with 17 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
shell/shellutils.cpp
View file

@ -12,7 +12,9 @@
// qt/kde includes
#include <QUrl>
#include <QFile>
#include <QRegExp>
#include <QFileInfo>
#include <QDir>
#include <QDebug>
#include <QtCore/qcommandlineparser.h>
namespace ShellUtils
@ -35,30 +37,21 @@ FileExistFunc qfileExistFunc()
QUrl urlFromArg( const QString& _arg, FileExistFunc exist_func, const QString& pageArg )
{
/*
Rationale for the small "cut-and-paste" work being done below:
KCmdLineArgs::makeURL() (used by ::url() encodes any # into the URL itself,
so we have to find it manually and build up the URL by taking its ref,
if any.
*/
QString arg = _arg;
arg.replace( QRegExp( "^file:/{1,3}"), "/" );
if ( arg != _arg )
{
arg = QString::fromUtf8( QByteArray::fromPercentEncoding( arg.toUtf8() ) );
// ## TODO remove exist_func
#if QT_VERSION >= 0x050400
QUrl url = QUrl::fromUserInput(_arg, QDir::currentPath());
#else
// Code from QUrl::fromUserInput(QString, QString)
QUrl url = QUrl::fromUserInput(_arg);
QUrl testUrl = QUrl(_arg, QUrl::TolerantMode);
if (testUrl.isRelative() && !QDir::isAbsolutePath(_arg)) {
QFileInfo fileInfo(QDir::current(), _arg);
if (fileInfo.exists())
url = QUrl::fromLocalFile(fileInfo.absoluteFilePath());
}
QUrl url = QUrl::fromUserInput( arg.toUtf8() );
int sharpPos = -1;
if ( !url.isLocalFile() || !exist_func( url.toLocalFile() ) )
{
sharpPos = arg.lastIndexOf( QLatin1Char( '#' ) );
}
if ( sharpPos != -1 )
{
url = QUrl::fromUserInput( arg.left( sharpPos ).toUtf8() );
url.setFragment( arg.mid( sharpPos + 1 ) );
}
else if ( !pageArg.isEmpty() )
#endif
if ( !pageArg.isEmpty() )
{
url.setFragment( pageArg );
}