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

List:       kde-commits
Subject:    =?utf-8?q?=5Bplasmate=5D_editors=3A_*_soooo_many_and_useless_con?=
From:       Diego Casella <polentino911 () gmail ! com>
Date:       2011-04-16 13:55:11
Message-ID: 20110416135511.D41E7A60A9 () git ! kde ! org
[Download RAW message or body]

Git commit 0bacc7bc874fa427343fadc6f17d8a9e212b1329 by Diego Casella.
Committed on 16/04/2011 at 15:48.
Pushed by casella into branch 'master'.

* soooo many and useless conversions from a QVariant(KUrl)->QString->KUrl. Simplified.

M  +4    -4    editors/editpage.cpp     

http://commits.kde.org/plasmate/0bacc7bc874fa427343fadc6f17d8a9e212b1329

diff --git a/editors/editpage.cpp b/editors/editpage.cpp
index 8b587a1..a16221f 100644
--- a/editors/editpage.cpp
+++ b/editors/editpage.cpp
@@ -60,7 +60,7 @@ void EditPage::doDelete(bool)
     QString path = selected.data(PackageModel::UrlRole).toString();
     QString name = selected.data(Qt::DisplayRole).toString();
     QString dialogText = i18n("Are you sure you want to delete this file: ");
-    int code = KMessageBox::warningContinueCancel(this, 
+    int code = KMessageBox::warningContinueCancel(this,
                   dialogText + "'" + name + "'?");
     if (code == KMessageBox::Continue)
         QFile::remove(path);
@@ -85,7 +85,7 @@ void EditPage::findEditor(const QModelIndex &index)
 {
     QStringList mimetypes = index.data(PackageModel::MimeTypeRole).toStringList();
     foreach(const QString &mimetype, mimetypes) {
-        QString target = index.data(PackageModel::UrlRole).toString();
+        KUrl target = index.data(PackageModel::UrlRole).toUrl();
         if (mimetype == "[plasmate]/metadata") {
             emit loadMetaDataEditor(target);
             return;
@@ -95,7 +95,7 @@ void EditPage::findEditor(const QModelIndex &index)
             QString dialogText = i18n( "Enter a name for the new file:" );
             QString file = KInputDialog::getText(QString(), dialogText);
             if (!file.isEmpty()) {
-                file = target + file;
+                file = target.pathOrUrl() + file;
                 QFile fl(file);
                 fl.open(QIODevice::ReadWrite); // create the file
                 fl.close();
@@ -113,7 +113,7 @@ void EditPage::findEditor(const QModelIndex &index)
             //create the part using offers.at(0)
             //kDebug() << offers.at(0);
             //offers.at(0)->createInstance(parentWidget);
-            emit loadEditor(offers, KUrl(target));
+            emit loadEditor(offers, target);
             return;
         }
     }

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