* Use Nepomuk for getting the meta data instead of KFileMetaInfo.

[dolphin.git] / src / renamedialog.cpp

diff --git a/src/renamedialog.cpp b/src/renamedialog.cpp
index fa5bf60e06278659e71ab70c24e6bc2802ecc8df..02dd2e9f6dbfe15fd4a330d9f4a1fdec11f4853c 100644 (file)
--- a/src/renamedialog.cpp
+++ b/src/renamedialog.cpp
@@ -65,8 +65,9 @@ RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :
     }
 
     m_lineEdit = new KLineEdit(page);
     }
 
     m_lineEdit = new KLineEdit(page);

-    QString extension = extensionString(items[0].url().prettyUrl());
+    QString extension = KMimeType::extractKnownExtension(items[0].url().prettyUrl());

     if (extension.length() > 0) {
     if (extension.length() > 0) {

+        extension.insert(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.
         // 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.


@@ -107,7 +108,8 @@ RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :
 }
 
 RenameDialog::~RenameDialog()
 }
 
 RenameDialog::~RenameDialog()

-{}
+{
+}

 
 void RenameDialog::slotButtonClicked(int button)
 {
 
 void RenameDialog::slotButtonClicked(int button)
 {


@@ -125,30 +127,4 @@ void RenameDialog::slotButtonClicked(int button)
     KDialog::slotButtonClicked(button);
 }
 
     KDialog::slotButtonClicked(button);
 }
 

-QString RenameDialog::extensionString(const QString& name)
-{
-    QString extension;
-    bool foundExtension = false;  // true if at least one valid file extension
-                                  // like "gif", "txt", ... has been found
-
-    QStringList strings = name.split('.');
-    const int size = strings.size();
-    for (int i = 1; i < size; ++i) {
-        const QString& str = strings.at(i);
-        if (!foundExtension) {
-            // Sub strings like "9", "12", "99", ... which contain only
-            // numbers don't count as extension. Usually they are version
-            // numbers like in "cmake-2.4.5".
-            bool ok = false;
-            str.toInt(&ok);
-            foundExtension = !ok;
-        }
-        if (foundExtension) {
-            extension += '.' + str;
-        }
-    }
-
-    return extension;
-}
-

 #include "renamedialog.moc"
 #include "renamedialog.moc"