fixed krazy issues (see http://www.kdedevelopers.org/node/3919)

svn path=/trunk/KDE/kdebase/apps/; revision=973269

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index e59f9b282cdbb09beeec36511b5128d66202a919..5cea1bde0fa859624c2642a897c46773651beb97 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -648,16 +648,19 @@ void DolphinView::renameSelectedItems()
     if (itemCount > 1) {
         // More than one item has been selected for renaming. Open
         // a rename dialog and rename all items afterwards.
-        RenameDialog dialog(this, items);
-        if (dialog.exec() == QDialog::Rejected) {
+        QPointer<RenameDialog> dialog = new RenameDialog(this, items);
+        if (dialog->exec() == QDialog::Rejected) {
+            delete dialog;
             return;
         }
 
-        const QString newName = dialog.newName();
+        const QString newName = dialog->newName();
         if (newName.isEmpty()) {
-            emit errorMessage(dialog.errorString());
+            emit errorMessage(dialog->errorString());
+            delete dialog;
             return;
         }
+        delete dialog;
 
         // TODO: check how this can be integrated into KIO::FileUndoManager/KonqOperations
         // as one operation instead of n rename operations like it is done now...
@@ -696,16 +699,19 @@ void DolphinView::renameSelectedItems()
     } else {
         Q_ASSERT(itemCount == 1);
 
-        RenameDialog dialog(this, items);
-        if (dialog.exec() == QDialog::Rejected) {
+        QPointer<RenameDialog> dialog = new RenameDialog(this, items);
+        if (dialog->exec() == QDialog::Rejected) {
+            delete dialog;
             return;
         }
 
-        const QString& newName = dialog.newName();
+        const QString newName = dialog->newName();
         if (newName.isEmpty()) {
-            emit errorMessage(dialog.errorString());
+            emit errorMessage(dialog->errorString());
+            delete dialog;
             return;
         }
+        delete dialog;
 
         const KUrl& oldUrl = items.first().url();
         KUrl newUrl = oldUrl;

diff --git a/src/dolphinviewactionhandler.cpp b/src/dolphinviewactionhandler.cpp
index 71e9fd3980a1ea82bc5e141117855ca515d8b1a5..0885cceb9535767e25ae9b5e6f9878d3b286b1ff 100644 (file)
--- a/src/dolphinviewactionhandler.cpp
+++ b/src/dolphinviewactionhandler.cpp
@@ -539,8 +539,9 @@ void DolphinViewActionHandler::slotSortTriggered(QAction* action)
 void DolphinViewActionHandler::slotAdjustViewProperties()
 {
     emit actionBeingHandled();
-    ViewPropertiesDialog dlg(m_currentView);
-    dlg.exec();
+    QPointer<ViewPropertiesDialog> dialog = new ViewPropertiesDialog(m_currentView);
+    dialog->exec();
+    delete dialog;
 }
 
 void DolphinViewActionHandler::slotFindFile()

diff --git a/src/main.cpp b/src/main.cpp
index e7f2771811bfe9e3952f1be93e64317d8e0a065c..832ff18b2e6e48d3da75630f552d10819d4e1d03 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -91,7 +91,7 @@ int main(int argc, char **argv)
             ++n;
         }
     }
-    app.exec();
+    app.exec(); // krazy:exclude=crashy
 
     return 0;
 }

diff --git a/src/panels/folders/folderspanel.cpp b/src/panels/folders/folderspanel.cpp
index eb957f7b9663718322eaed5c79fbb660a7653a5c..1e3bdb8a67371951c73dd7a823ac6684d6fa04f1 100644 (file)
--- a/src/panels/folders/folderspanel.cpp
+++ b/src/panels/folders/folderspanel.cpp
@@ -96,15 +96,16 @@ void FoldersPanel::rename(const KFileItem& item)
     } else {
         KFileItemList items;
         items.append(item);
-        RenameDialog dialog(this, items);
-        if (dialog.exec() == QDialog::Accepted) {
-            const QString& newName = dialog.newName();
+        QPointer<RenameDialog> dialog = new RenameDialog(this, items);
+        if (dialog->exec() == QDialog::Accepted) {
+            const QString newName = dialog->newName();
             if (!newName.isEmpty()) {
                 KUrl newUrl = item.url();
                 newUrl.setFileName(newName);
                 KonqOperations::rename(this, item.url(), newUrl);
             }
         }
+        delete dialog;
     }
 }
 

diff --git a/src/panels/folders/treeviewcontextmenu.cpp b/src/panels/folders/treeviewcontextmenu.cpp
index 3bc3ab9fee4ea233fd5efcf41643a2e4d5c343b8..32e92e05c2e8fcb874580c9d7536cff0960d291c 100644 (file)
--- a/src/panels/folders/treeviewcontextmenu.cpp
+++ b/src/panels/folders/treeviewcontextmenu.cpp
@@ -34,8 +34,9 @@
 
 #include "folderspanel.h"
 
-#include <QtGui/QApplication>
-#include <QtGui/QClipboard>
+#include <QApplication>
+#include <QClipboard>
+#include <QPointer>
 
 TreeViewContextMenu::TreeViewContextMenu(FoldersPanel* parent,
                                          const KFileItem& fileInfo) :
@@ -182,8 +183,9 @@ void TreeViewContextMenu::deleteItem()
 
 void TreeViewContextMenu::showProperties()
 {
-    KPropertiesDialog dialog(m_fileInfo.url(), m_parent);
-    dialog.exec();
+    QPointer<KPropertiesDialog> dialog = new KPropertiesDialog(m_fileInfo.url(), m_parent);
+    dialog->exec();
+    delete dialog;
 }
 
 void TreeViewContextMenu::setShowHiddenFiles(bool show)

diff --git a/src/panels/information/newtagdialog.cpp b/src/panels/information/newtagdialog.cpp
index 8785d578c1c72126f413c7258f6e48c5a795d89a..05189ea481fa3d69f6a0f2f0dca1da4c9c5766a1 100644 (file)
--- a/src/panels/information/newtagdialog.cpp
+++ b/src/panels/information/newtagdialog.cpp
@@ -64,17 +64,18 @@ void NewTagDialog::slotLabelChanged( const QString& text )
 
 Nepomuk::Tag NewTagDialog::createTag( QWidget* parent )
 {
-    NewTagDialog dlg( parent );
-    dlg.m_labelTitle->setText( i18nc( "@title:window", "Create New Tag" ) );
-    dlg.m_labelTitle->setComment( i18nc( "@title:window subtitle to previous message", "with optional icon and description" ) );
-    dlg.m_labelTitle->setPixmap( KIcon( "nepomuk" ).pixmap( 32, 32 ) );
+    QPointer<NewTagDialog> dlg = new NewTagDialog( parent );
+    dlg->m_labelTitle->setText( i18nc( "@title:window", "Create New Tag" ) );
+    dlg->m_labelTitle->setComment( i18nc( "@title:window subtitle to previous message", "with optional icon and description" ) );
+    dlg->m_labelTitle->setPixmap( KIcon( "nepomuk" ).pixmap( 32, 32 ) );
 
-    dlg.m_editTagLabel->setFocus();
+    dlg->m_editTagLabel->setFocus();
 
-    if ( dlg.exec() ) {
-        QString name = dlg.m_editTagLabel->text();
-        QString comment = dlg.m_editTagComment->text();
-        QString icon = dlg.m_buttonTagIcon->icon();
+    if ( dlg->exec() ) {
+        QString name = dlg->m_editTagLabel->text();
+        QString comment = dlg->m_editTagComment->text();
+        QString icon = dlg->m_buttonTagIcon->icon();
+        delete dlg;
 
         Nepomuk::Tag newTag( name );
         newTag.setLabel( name );
@@ -88,6 +89,7 @@ Nepomuk::Tag NewTagDialog::createTag( QWidget* parent )
         return newTag;
     }
     else {
+        delete dlg;
         return Nepomuk::Tag();
     }
 }

diff --git a/src/renamedialog.h b/src/renamedialog.h
index 1eaae2c6180c3f54dc98c5201f09b3706818a62d..eca5f4d06883f727a386373d9b37fe39136c34aa 100644 (file)
--- a/src/renamedialog.h
+++ b/src/renamedialog.h
@@ -24,11 +24,12 @@
 #include <kdialog.h>
 #include <kurl.h>
 
-
 class KFileItem;
 class KFileItemList;
 class KLineEdit;
 
+#include <QString>
+
 /**
  * @brief Dialog for renaming a variable number of files.
  *
@@ -65,18 +66,12 @@ public:
      * been deleted by the user, although more than one item should be
      * renamed).
      */
-    const QString& newName() const
-    {
-        return m_newName;
-    }
+    QString newName() const;
 
     /**
      * Returns the error string, if Dialog::newName() returned an empty string.
      */
-    const QString& errorString() const
-    {
-        return m_errorString;
-    }
+    QString errorString() const;
 
 protected slots:
     virtual void slotButtonClicked(int button);
@@ -90,4 +85,14 @@ private:
     friend class RenameDialogTest; // allow access for unit testing
 };
 
+inline QString RenameDialog::newName() const
+{
+    return m_newName;
+}
+
+inline QString RenameDialog::errorString() const
+{
+    return m_errorString;
+}
+
 #endif

diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp
index 7bd992ef15e83d4282e99cc51e14c6679133471b..7c5aa7e99d0772edf09bb055036d40ee0f6e5a19 100644 (file)
--- a/src/settings/viewpropertiesdialog.cpp
+++ b/src/settings/viewpropertiesdialog.cpp
@@ -316,11 +316,12 @@ void ViewPropertiesDialog::configureAdditionalInfo()
         m_viewProps->setAdditionalInfo(info);
     }
 
-    AdditionalInfoDialog dialog(this, info);
-    if (dialog.exec() == QDialog::Accepted) {
-        m_viewProps->setAdditionalInfo(dialog.additionalInfo());
+    QPointer<AdditionalInfoDialog> dialog = new AdditionalInfoDialog(this, info);
+    if (dialog->exec() == QDialog::Accepted) {
+        m_viewProps->setAdditionalInfo(dialog->additionalInfo());
         markAsDirty(true);
     }
+    delete dialog;
 }
 
 void ViewPropertiesDialog::applyViewProperties()