From ba1aeef06fc2c4c3c2aecc2b39552882628ef231 Mon Sep 17 00:00:00 2001 From: "Martin T. H. Sandsmark" Date: Sun, 24 Jul 2016 19:14:29 +0200 Subject: [PATCH] Remove dead and unused code after porting to Qt5 QUrl --- autotests/shelltest.cpp | 24 +----------------------- shell/okular_main.cpp | 6 +++--- shell/shellutils.cpp | 18 +----------------- shell/shellutils.h | 5 +---- 4 files changed, 6 insertions(+), 47 deletions(-) diff --git a/autotests/shelltest.cpp b/autotests/shelltest.cpp index a63ccca79..054532964 100644 --- a/autotests/shelltest.cpp +++ b/autotests/shelltest.cpp @@ -23,16 +23,6 @@ static const QUrl makeUrlFromCwd( const QString& u, const QString& ref = QString return url; } -static bool fileExist_always_Func( const QString& ) -{ - return true; -} - -static bool fileExist_never_Func( const QString& ) -{ - return false; -} - class ShellTest : public QObject { @@ -52,35 +42,28 @@ void ShellTest::initTestCase() void ShellTest::testUrlArgs_data() { QTest::addColumn( "arg" ); - QTest::addColumn( "exists" ); QTest::addColumn( "resUrl" ); // local files QTest::newRow( "foo.pdf, exist" ) << "foo.pdf" - << true << makeUrlFromCwd( QStringLiteral("foo.pdf") ); QTest::newRow( "foo.pdf, !exist" ) << "foo.pdf" - << false << makeUrlFromCwd( QStringLiteral("foo.pdf") ); QTest::newRow( "foo#bar.pdf, !exist" ) << "foo#bar.pdf" - << false << makeUrlFromCwd( QStringLiteral("foo#bar.pdf") ); QTest::newRow( "foo.pdf#anchor, !exist" ) << "foo.pdf#anchor" - << false << makeUrlFromCwd( QStringLiteral("foo.pdf"), QStringLiteral("anchor") ); QTest::newRow( "#207461" ) << "file:///tmp/file%20with%20spaces.pdf" - << true << QUrl( QStringLiteral("file:///tmp/file%20with%20spaces.pdf") ); // non-local files QTest::newRow( "http://kde.org/foo.pdf" ) << "http://kde.org/foo.pdf" - << true << QUrl( QStringLiteral("http://kde.org/foo.pdf") ); // make sure we don't have a fragment QUrl hashInName( QStringLiteral("http://kde.org") ); @@ -89,33 +72,28 @@ void ShellTest::testUrlArgs_data() QVERIFY( hashInName.fragment().isEmpty() ); QTest::newRow( "http://kde.org/foo#bar.pdf" ) << "http://kde.org/foo#bar.pdf" - << true << hashInName; QUrl withAnchor( QStringLiteral("http://kde.org/foo.pdf") ); withAnchor.setFragment( QStringLiteral("anchor") ); QTest::newRow( "http://kde.org/foo.pdf#anchor" ) << "http://kde.org/foo.pdf#anchor" - << true << withAnchor; QTest::newRow( "#207461" ) << "http://homepages.inf.ed.ac.uk/mef/file%20with%20spaces.pdf" - << true << QUrl( QStringLiteral("http://homepages.inf.ed.ac.uk/mef/file%20with%20spaces.pdf") ); QUrl openOnPage3 = QUrl( QStringLiteral("http://itzsimpl.info/lectures/CG/L2-transformations.pdf") ); openOnPage3.setFragment( QStringLiteral("3") ); QTest::newRow( "RR124738" ) << "http://itzsimpl.info/lectures/CG/L2-transformations.pdf#3" - << true << openOnPage3; } void ShellTest::testUrlArgs() { QFETCH( QString, arg ); - QFETCH( bool, exists ); QFETCH( QUrl, resUrl ); qDebug() << "Expected url:" << resUrl << "path =" << resUrl.path() << "fragment =" << resUrl.fragment(); - QUrl url = ShellUtils::urlFromArg( arg, exists ? fileExist_always_Func : fileExist_never_Func ); + QUrl url = ShellUtils::urlFromArg( arg ); QCOMPARE( url, resUrl ); } diff --git a/shell/okular_main.cpp b/shell/okular_main.cpp index 2285f64a9..b4de3d447 100644 --- a/shell/okular_main.cpp +++ b/shell/okular_main.cpp @@ -33,7 +33,7 @@ static bool attachUniqueInstance(const QStringList &paths, const QString &serial return false; const QString page = ShellUtils::page(serializedOptions); - iface.call(QStringLiteral("openDocument"), ShellUtils::urlFromArg(paths[0], ShellUtils::qfileExistFunc(), page).url(), serializedOptions); + iface.call(QStringLiteral("openDocument"), ShellUtils::urlFromArg(paths[0], page).url(), serializedOptions); if (!ShellUtils::noRaise(serializedOptions)) { iface.call(QStringLiteral("tryRaise")); } @@ -103,7 +103,7 @@ static bool attachExistingInstance(const QStringList &paths, const QString &seri { // Page only makes sense if we are opening one file const QString page = ShellUtils::page(serializedOptions); - path = ShellUtils::urlFromArg(arg, ShellUtils::qfileExistFunc(), page).url(); + path = ShellUtils::urlFromArg(arg, page).url(); } // Returns false if it can't fit another document @@ -166,7 +166,7 @@ Status main(const QStringList &paths, const QString &serializedOptions) { // Page only makes sense if we are opening one file const QString page = ShellUtils::page(serializedOptions); - const QUrl url = ShellUtils::urlFromArg(paths[i], ShellUtils::qfileExistFunc(), page); + const QUrl url = ShellUtils::urlFromArg(paths[i], page); if ( shell->openDocument( url, serializedOptions) ) { ++i; diff --git a/shell/shellutils.cpp b/shell/shellutils.cpp index 0e79634f4..11fe7d1a9 100644 --- a/shell/shellutils.cpp +++ b/shell/shellutils.cpp @@ -20,24 +20,8 @@ namespace ShellUtils { -namespace detail +QUrl urlFromArg( const QString& _arg, const QString& pageArg ) { - -bool qfileExistFunc( const QString& fileName ) -{ - return QFile::exists( fileName ); -} - -} - -FileExistFunc qfileExistFunc() -{ - return detail::qfileExistFunc; -} - -QUrl urlFromArg( const QString& _arg, FileExistFunc exist_func, const QString& pageArg ) -{ - // ## TODO remove exist_func #if QT_VERSION >= 0x050400 QUrl url = QUrl::fromUserInput(_arg, QDir::currentPath(), QUrl::AssumeLocalFile); #else diff --git a/shell/shellutils.h b/shell/shellutils.h index 8aa754ecf..16370e758 100644 --- a/shell/shellutils.h +++ b/shell/shellutils.h @@ -19,10 +19,7 @@ class QCommandLineParser; namespace ShellUtils { -typedef bool (*FileExistFunc)( const QString& fileName ); - -FileExistFunc qfileExistFunc(); -QUrl urlFromArg( const QString& _arg, FileExistFunc exist_func, const QString& pageArg = QString() ); +QUrl urlFromArg(const QString& _arg, const QString& pageArg = QString() ); QString serializeOptions(const QCommandLineParser &args); QString serializeOptions(bool startInPresentation, bool showPrintDialog, bool unique, bool noRaise, const QString &page); bool unserializeOptions(const QString &serializedOptions, bool *presentation, bool *print, bool *unique, bool *noraise, QString *page);