[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/kmenuedit
From:       Laurent Montel <montel () kde ! org>
Date:       2005-09-24 12:06:12
Message-ID: 1127563572.090159.29985.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 463533 by mlaurent:

remove q3_support into qstring


 M  +1 -1      menufile.cpp  
 M  +7 -7      treeview.cpp  


--- trunk/KDE/kdebase/kmenuedit/menufile.cpp #463532:463533
@@ -200,7 +200,7 @@
    if (local.isEmpty() || local.startsWith("/"))
    {
       // What now? Use filename only and hope for the best.
-      local = path.mid(path.findRev('/')+1);
+      local = path.mid(path.lastIndexOf('/')+1);
    }
    return local;                                                                     \
  }
--- trunk/KDE/kdebase/kmenuedit/treeview.cpp #463532:463533
@@ -284,7 +284,7 @@
     folderInfo->directoryFile = folder->directoryEntryPath();
     folderInfo->icon = folder->icon();
     QString id = folder->relPath();
-    int i = id.findRev('/', -2);
+    int i = id.lastIndexOf('/', -2);
     id = id.mid(i+1);
     folderInfo->id = id;
     folderInfo->fullId = prefix + id;
@@ -598,7 +598,7 @@
     QString relativePath = rPath;
 
     // truncate "/.directory"
-    int pos = relativePath.findRev("/.directory");
+    int pos = relativePath.lastIndexOf("/.directory");
     if (pos > 0) relativePath.truncate(pos);
 
     QStringList filelist;
@@ -637,7 +637,7 @@
     QString relativePath = rPath;
 
     // truncate "/.directory"
-    int pos = relativePath.findRev("/.directory");
+    int pos = relativePath.lastIndexOf("/.directory");
     if (pos > 0) relativePath.truncate(pos);
 
     QStringList dirlist;
@@ -685,8 +685,8 @@
 
 static QString createDesktopFile(const QString &file, QString *menuId, QStringList \
*excludeList)  {
-   QString base = file.mid(file.findRev('/')+1);
-   base = base.left(base.findRev('.'));
+   QString base = file.mid(file.lastIndexOf('/')+1);
+   base = base.left(base.lastIndexOf('.'));
 
    QRegExp r("(.*)(?=-\\d+)");
    base = (r.search(base) > -1) ? r.cap(1) : base;
@@ -709,8 +709,8 @@
 
 static QString createDirectoryFile(const QString &file, QStringList *excludeList)
 {
-   QString base = file.mid(file.findRev('/')+1);
-   base = base.left(base.findRev('.'));
+   QString base = file.mid(file.lastIndexOf('/')+1);
+   base = base.left(base.lastIndexOf('.'));
 
    QString result;
    int i = 1;


[prev in list] [next in list] [prev in thread] [next in thread]