[repo.or.cz] nomnom.git branch next updated: v0.2.0-21-gac14a94

[<nom...@li...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project nomnom.git.

The branch, next has been updated
       via  ac14a94f684982ce7c3016753c2cddd950025179 (commit)
      from  b870a8205a75aab21aed05409f439c37e82d8b0c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://repo.or.cz/w/nomnom.git/commit/ac14a94f684982ce7c3016753c2cddd950025179

commit ac14a94f684982ce7c3016753c2cddd950025179
Author: Toni Gundogdu <le...@gm...>
Date:   Sun Oct 30 12:25:27 2011 +0200

    Fix umph integration
    
      * umph returned "nothing found" even with feeds with items
      * Make nn::to_cmd_args use QString::SkipEmptyParts

diff --git a/src/i/MainWindow.cpp b/src/i/MainWindow.cpp
index 37c9445..5ebd2a1 100644
--- a/src/i/MainWindow.cpp
+++ b/src/i/MainWindow.cpp
@@ -699,6 +699,9 @@ void MainWindow::onFeed()
                     .simplified();
 
   QStringList args = nn::to_cmd_args(p);
+#ifdef ENABLE_VERBOSE
+  qDebug() << __PRETTY_FUNCTION__ << __LINE__ << "args=" << args;
+#endif
   const QString r = args.first();
 
   if (r.isEmpty())
diff --git a/src/util/nutil.cpp b/src/util/nutil.cpp
index 31dbb5f..3f23b6d 100644
--- a/src/util/nutil.cpp
+++ b/src/util/nutil.cpp
@@ -134,17 +134,20 @@ QStringList to_cmd_args(const QString& s)
 
 // $cmd_path:$cmd_args
 
-  if (s.simplified().contains(NSETTINGS_CMDPATH_SEPARATOR))
+  static const QString::SplitBehavior sb = QString::SkipEmptyParts;
+  static const QString sep = NSETTINGS_CMDPATH_SEPARATOR;
+
+  if (s.simplified().contains(sep))
     {
-      QStringList r, a = s.simplified().split(NSETTINGS_CMDPATH_SEPARATOR);
+      QStringList r, a = s.simplified().split(sep);
       r << a.takeFirst();
-      r << a.takeFirst().split(" ");
+      r << a.takeFirst().split(" ", sb);
       return r;
     }
 
 // "Other" value.
 
-  return s.simplified().split(" ");
+  return s.simplified().split(" ", sb);
 }
 
 } // namespace nn

-----------------------------------------------------------------------

Summary of changes:
 src/i/MainWindow.cpp |    3 +++
 src/util/nutil.cpp   |   11 +++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)


repo.or.cz automatic notification. Contact project admin le...@gm...
if you want to unsubscribe, or site admin ad...@re... if you receive
no reply.
-- 
nomnom.git ("The graphical media download tool")