[Pkg-owncloud-commits] [owncloud-client] 35/70: accountsettings: remove unused function

Sandro Knauß hefee-guest at moszumanska.debian.org
Tue Jul 1 10:21:20 UTC 2014


This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 83171bf02513d7650a92e856c65d0b34832aaeca
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Fri Jun 20 11:27:37 2014 +0200

    accountsettings: remove unused function
    
    It was moved into owncloudgui before
    And it was broken (bad use of QUrl and use of null pointer
---
 src/mirall/accountsettings.cpp | 22 ----------------------
 src/mirall/accountsettings.h   |  1 -
 2 files changed, 23 deletions(-)

diff --git a/src/mirall/accountsettings.cpp b/src/mirall/accountsettings.cpp
index 5200d02..6ab4044 100644
--- a/src/mirall/accountsettings.cpp
+++ b/src/mirall/accountsettings.cpp
@@ -416,28 +416,6 @@ void AccountSettings::setFolderList( const Folder::Map &folders )
 
 }
 
-// move from Application
-void AccountSettings::slotFolderOpenAction( const QString& alias )
-{
-    Folder *f = FolderMan::instance()->folder(alias);
-    qDebug() << "opening local url " << f->path();
-    if( f ) {
-        QUrl url(f->path(), QUrl::TolerantMode);
-        url.setScheme( QLatin1String("file") );
-
-#ifdef Q_OS_WIN
-        // work around a bug in QDesktopServices on Win32, see i-net
-        QString filePath = f->path();
-
-        if (filePath.startsWith(QLatin1String("\\\\")) || filePath.startsWith(QLatin1String("//")))
-            url.setUrl(QDir::toNativeSeparators(filePath));
-        else
-            url = QUrl::fromLocalFile(filePath);
-#endif
-        QDesktopServices::openUrl(url);
-    }
-}
-
 void AccountSettings::slotEnableCurrentFolder()
 {
     QModelIndex selected = ui->_folderList->selectionModel()->currentIndex();
diff --git a/src/mirall/accountsettings.h b/src/mirall/accountsettings.h
index fd36a2f..4e64ea2 100644
--- a/src/mirall/accountsettings.h
+++ b/src/mirall/accountsettings.h
@@ -60,7 +60,6 @@ public slots:
     void slotOpenOC();
     void slotUpdateFolderState( Folder* );
     void slotDoubleClicked( const QModelIndex& );
-    void slotFolderOpenAction( const QString& );
     void slotSetProgress(const QString& folder, const Progress::Info& progress);
     void slotButtonsSetEnabled();
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git



More information about the Pkg-owncloud-commits mailing list