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

List:       kde-commits
Subject:    KDE/kdepim
From:       Thomas McGuire <Thomas.McGuire () gmx ! net>
Date:       2007-05-21 15:05:01
Message-ID: 1179759901.910237.15823.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 667016 by tmcguire:

Fix message drag&drop in KMail.
For some reason, the list of acceptable mimetypes got corrupted when using const char*.
It now uses QString.

 M  +1 -1      kmail/kmfoldertree.cpp  
 M  +2 -2      libkdepim/kfoldertree.cpp  
 M  +2 -2      libkdepim/kfoldertree.h  


--- trunk/KDE/kdepim/kmail/kmfoldertree.cpp #667015:667016
@@ -350,7 +350,7 @@
 
   mUpdateCountTimer= new QTimer( this );
 
-  addAcceptableDropMimetype( qPrintable(MailList::mimeDataType()), false);
+  addAcceptableDropMimetype( MailList::mimeDataType(), false);
   setDragEnabled( true );
   addAcceptableDropMimetype( "application/x-qlistviewitem", false );
 
--- trunk/KDE/kdepim/libkdepim/kfoldertree.cpp #667015:667016
@@ -368,7 +368,7 @@
 }
 
 //-----------------------------------------------------------------------------
-void KFolderTree::addAcceptableDropMimetype( const char *mimeType, bool outsideOk )
+void KFolderTree::addAcceptableDropMimetype( QString mimeType, bool outsideOk )
 {
   mAcceptableDropMimetypes.append( mimeType );
   mAcceptOutside.append( outsideOk );
@@ -381,7 +381,7 @@
 
   for ( int i = 0; i < mAcceptableDropMimetypes.size(); i++ )
   {
-    if (event->provides(mAcceptableDropMimetypes[i]))
+    if (event->provides( qPrintable(mAcceptableDropMimetypes[i]) ))
     {
       if (item)
         return (static_cast<KFolderTreeItem*>(item))->acceptDrag(event);
--- trunk/KDE/kdepim/libkdepim/kfoldertree.h #667015:667016
@@ -231,7 +231,7 @@
       @param mimeType the name of the MIMEType
       @param outsideOk accept drops of this type even if
       the mouse cursor is not on top of an item */
-    virtual void addAcceptableDropMimetype( const char *mimeType, bool outsideOk );
+    virtual void addAcceptableDropMimetype( QString mimeType, bool outsideOk );
 
     /** checks if the drag is acceptable */
     virtual bool acceptDrag( QDropEvent* event ) const;
@@ -272,7 +272,7 @@
     virtual void contentsMouseReleaseEvent( QMouseEvent *e );
 
     /** for mimetypes */
-    QVector<const char*> mAcceptableDropMimetypes;
+    QVector<QString> mAcceptableDropMimetypes;
     QVector<bool> mAcceptOutside;
 
     /** shared information */ // ### why isn't it then static? ;-)
[prev in list] [next in list] [prev in thread] [next in thread]