Test for what the error message says

[dolphin.git] / src / renamedialog.cpp

diff --git a/src/renamedialog.cpp b/src/renamedialog.cpp
index 6f08f175ec55e3b70903884a88bf35f075f67831..4ea15568c6b35399f09d1146b805c34d6f90181c 100644 (file)
--- a/src/renamedialog.cpp
+++ b/src/renamedialog.cpp
@@ -26,14 +26,14 @@
 #include <QtGui/QLabel>
 #include <QtGui/QBoxLayout>
 
-RenameDialog::RenameDialog(const KUrl::List& urls, const QList<KFileItem>& items) :
+RenameDialog::RenameDialog(const QList<KFileItem>& items) :
     KDialog(),
     m_renameOneItem(false)
 {
     const QSize minSize = minimumSize();
     setMinimumSize(QSize(320, minSize.height()));
 
-    const int itemCount = urls.count();
+    const int itemCount = items.count();
     Q_ASSERT(itemCount >= 1);
     m_renameOneItem = (itemCount == 1);
 
@@ -65,13 +65,13 @@ RenameDialog::RenameDialog(const KUrl::List& urls, const QList<KFileItem>& items
     }
 
     m_lineEdit = new KLineEdit(page);
-    QString extension = extensionString(urls[0].prettyUrl());
+    QString extension = extensionString(items[0].url().prettyUrl());
     if (extension.length() > 0) {
         // The first item seems to have a extension (e. g. '.jpg' or '.txt'). Now
         // check whether all other URLs have the same extension. If this is the
         // case, add this extension to the name suggestion.
         for (int i = 1; i < itemCount; ++i) {
-            if (!urls[i].prettyUrl().contains(extension)) {
+            if (!items[i].url().prettyUrl().contains(extension)) {
                 // at least one item does not have the same extension
                 extension.truncate(0);
                 break;
@@ -116,7 +116,7 @@ void RenameDialog::slotButtonClicked(int button)
         if (m_newName.isEmpty()) {
             m_errorString = i18nc("@info:status",
                                   "The new name is empty. A name with at least one character must be entered.");
-        } else if (!m_renameOneItem && m_newName.contains('#') != 1) {
+        } else if (!m_renameOneItem && m_newName.count('#') != 1 ) {
             m_newName.truncate(0);
             m_errorString = i18nc("@info:status", "The name must contain exactly one # character.");
         }