[Pkg-owncloud-commits] [owncloud-client] 90/484: Utility: add method fileNameForGuiUse(), pimp up filename for GUI

[Sandro Knauß]

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 4ad165ce26f1a26ac30b7ac92ffc5266443485f0
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Mon Oct 19 14:36:55 2015 +0200

    Utility: add method fileNameForGuiUse(), pimp up filename for GUI
    
    Currently, this one only replaces colons by / on Mac platform. This makes
    the function resuseable.
---
 src/gui/protocolwidget.cpp | 11 +----------
 src/gui/protocolwidget.h   |  2 --
 src/libsync/utility.cpp    |  9 +++++++++
 src/libsync/utility.h      |  2 ++
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/gui/protocolwidget.cpp b/src/gui/protocolwidget.cpp
index 69829a4..5ecd4a9 100644
--- a/src/gui/protocolwidget.cpp
+++ b/src/gui/protocolwidget.cpp
@@ -192,15 +192,6 @@ void ProtocolWidget::slotOpenFile( QTreeWidgetItem *item, int )
     }
 }
 
-QString ProtocolWidget::fixupFilename( const QString& name )
-{
-    if( Utility::isMac() ) {
-        QString n(name);
-        return n.replace(QChar(':'), QChar('/'));
-    }
-    return name;
-}
-
 QTreeWidgetItem* ProtocolWidget::createCompletedTreewidgetItem(const QString& folder, const SyncFileItem& item)
 {
     auto f = FolderMan::instance()->folder(folder);
@@ -214,7 +205,7 @@ QTreeWidgetItem* ProtocolWidget::createCompletedTreewidgetItem(const QString& fo
     const QString longTimeStr = timeString(timestamp, QLocale::LongFormat);
 
     columns << timeStr;
-    columns << fixupFilename(item._originalFile);
+    columns << Utility::fileNameForGuiUse(item._originalFile);
     columns << f->shortGuiPath();
 
     // If the error string is set, it's prefered because it is a useful user message.
diff --git a/src/gui/protocolwidget.h b/src/gui/protocolwidget.h
index 2e5bf65..1a07eca 100644
--- a/src/gui/protocolwidget.h
+++ b/src/gui/protocolwidget.h
@@ -65,8 +65,6 @@ private:
     void setSyncResultStatus(const SyncResult& result );
     void cleanIgnoreItems( const QString& folder );
     void computeResyncButtonEnabled();
-    QString fixupFilename( const QString& name );
-
 
     QTreeWidgetItem* createCompletedTreewidgetItem(const QString &folder, const SyncFileItem &item );
 
diff --git a/src/libsync/utility.cpp b/src/libsync/utility.cpp
index 4598898..843aab1 100644
--- a/src/libsync/utility.cpp
+++ b/src/libsync/utility.cpp
@@ -337,6 +337,15 @@ QString Utility::durationToDescriptiveString(quint64 msecs)
             QCoreApplication::translate("Utility", periods[p+1].name, 0, QCoreApplication::UnicodeUTF8, secondPartNum));
 }
 
+QString Utility::fileNameForGuiUse(const QString& fName)
+{
+    if( isMac() ) {
+        QString n(fName);
+        return n.replace(QChar(':'), QChar('/'));
+    }
+    return fName;
+}
+
 bool Utility::hasDarkSystray()
 {
     return hasDarkSystray_private();
diff --git a/src/libsync/utility.h b/src/libsync/utility.h
index 40e7961..35523f4 100644
--- a/src/libsync/utility.h
+++ b/src/libsync/utility.h
@@ -105,6 +105,8 @@ namespace Utility
     // For Mac and Windows, it returns QString()
     OWNCLOUDSYNC_EXPORT QByteArray versionOfInstalledBinary(const QString& command = QString() );
 
+    OWNCLOUDSYNC_EXPORT QString fileNameForGuiUse(const QString& fName);
+
     class OWNCLOUDSYNC_EXPORT StopWatch {
     private:
         QHash<QString, quint64> _lapTimes;

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