Use custom mime format for internal data exchange in Favorites tree

favoritespanewidget.cc

@@ -8,7 +8,6 @@
 #include <QClipboard>
 #include <QDomDocument>
 #include <QMessageBox>
-#include <QMimeData>
 #include <QtAlgorithms>
 #include <QMap>
 
@@ -771,24 +770,13 @@ void FavoritesModel::checkNodeForExpand( const TreeItem * item, const QModelInde
 
 QStringList FavoritesModel::mimeTypes() const
 {
-  return QStringList( QString::fromLatin1( "text/plain" ) );
+  return QStringList( QString::fromLatin1( FAVORITES_MIME_TYPE ) );
 }
 
 QMimeData *FavoritesModel::mimeData( const QModelIndexList & indexes ) const
 {
-  QString headwords;
+  FavoritesMimeData *data = new FavoritesMimeData();
-
+  data->setIndexesList( indexes );
-  QList< QModelIndex >::const_iterator it = indexes.begin();
-  for ( ; it != indexes.end(); ++it )
-  {
-    TreeItem *item = getItem( *it );
-    headwords += item->fullPath() + "\n\r";
-    headwords += item->data().toString() + "\n\r";
-    headwords += QString::number( item->type() ) + "\n\r";
-  }
-
-  QMimeData *data = new QMimeData();
-  data->setText( headwords );
   return data;
 }
 
@@ -797,8 +785,12 @@ bool FavoritesModel::dropMimeData(const QMimeData *data, Qt::DropAction action,
 {
   if( action == Qt::MoveAction || action == Qt::CopyAction )
   {
-    QList< QModelIndex > list;
+    if( data->hasFormat( FAVORITES_MIME_TYPE ) )
-    list = itemsListFromText( data->text() );
+    {
+      FavoritesMimeData const * mimeData = qobject_cast< FavoritesMimeData const * >( data );
+      if( mimeData )
+      {
+        QModelIndexList const & list = mimeData->getIndexesList();
 
         if( list.isEmpty() )
           return false;
@@ -837,6 +829,8 @@ bool FavoritesModel::dropMimeData(const QMimeData *data, Qt::DropAction action,
 
         return true;
       }
+    }
+  }
   return false;
 }
 
@@ -853,85 +847,6 @@ QModelIndex FavoritesModel::findItemInFolder( const QString & itemName, int item
   return QModelIndex();
 }
 
-QModelIndex FavoritesModel::findItem( const QString & path,
-                                      const QString & headword,
-                                      int type )
-{
-  TreeItem *par = rootItem;
-
-  if( !path.isEmpty() )
-  {
-    // Find target folder
-
-    QStringList folders = path.split( "/", QString::SkipEmptyParts );
-    QStringList::const_iterator it = folders.begin();
-    for( ; it != folders.end(); ++it )
-    {
-      int i;
-      for( i = 0; i < par->childCount(); i++ )
-      {
-        TreeItem * item = par->child( i );
-        QString name = item->data().toString();
-        if( *it == name && item->type() == TreeItem::Folder )
-          break;
-      }
-      if( i >= par->childCount() ) // Folder not found
-        return QModelIndex();
-
-      par = par->child( i );
-    }
-  }
-
-  // Find headword/folder in target folder
-
-  for( int i = 0; i < par->childCount(); i++ )
-  {
-    TreeItem * item = par->child( i );
-    QString name = item->data().toString();
-    if( name == headword && item->type() == type )
-    {
-      // Item found, create index
-      return createIndex( i, 0, item );
-    }
-  }
-  return QModelIndex();
-}
-
-QList< QModelIndex > FavoritesModel::itemsListFromText( const QString & text )
-{
-  int pos = 0;
-  QString delim = QString::fromLatin1( "\n\r" );
-  QList< QModelIndex > list;
-
-  for( ; ; )
-  {
-    int delimPos = text.indexOf( delim, pos );
-    if( delimPos < 0 )
-      break;
-    QString path = text.mid( pos, delimPos - pos );
-
-    pos = delimPos + 2;
-    delimPos = text.indexOf( delim, pos );
-    if( delimPos < 0 )
-      break;
-    QString headword = text.mid( pos, delimPos - pos );
-
-    pos = delimPos + 2;
-    delimPos = text.indexOf( delim, pos );
-    if( delimPos < 0 )
-      break;
-    int type = text.mid( pos, delimPos - pos ).toInt();
-
-    QModelIndex idx = findItem( path, headword, type );
-    if( idx.isValid() )
-      list.append( idx );
-
-    pos = delimPos + 2;
-  }
-
-  return list;
-}
-
 TreeItem *FavoritesModel::getItem( const QModelIndex &index ) const
 {
   if( index.isValid() )

favoritespanewidget.hh

@@ -13,6 +13,7 @@
 #include <QMenu>
 #include <QDomNode>
 #include <QList>
+#include <QMimeData>
 
 #include <config.hh>
 #include "delegate.hh"
@@ -220,14 +221,6 @@ protected:
   QModelIndex findItemInFolder( QString const & itemName, int itemType,
                                 QModelIndex const & parentIdx );
 
-  // Find item by it params
-  QModelIndex findItem( QString const & path,
-                        QString const & headword,
-                        int type );
-
-  // Create items list from mime "plait/text" data
-  QList< QModelIndex > itemsListFromText( QString const & text );
-
   TreeItem *getItem( const QModelIndex &index ) const;
 
   // Find folder with given name or create it if folder not exist
@@ -247,4 +240,30 @@ private:
   bool dirty;
 };
 
+#define FAVORITES_MIME_TYPE "application/x-goldendict-tree-items"
+
+class FavoritesMimeData : public QMimeData
+{
+  Q_OBJECT
+public:
+  FavoritesMimeData() : QMimeData()
+  {}
+
+  virtual QStringList formats() const
+  { return QStringList( QString::fromLatin1( FAVORITES_MIME_TYPE ) ); }
+
+  virtual bool hasFormat(const QString & mimetype) const
+  { return mimetype.compare( QString::fromLatin1( FAVORITES_MIME_TYPE ) ) == 0; }
+
+  void setIndexesList( QModelIndexList const & list )
+  { indexes.clear(); indexes = list; }
+
+  QModelIndexList const & getIndexesList() const
+  { return indexes; }
+
+private:
+  QStringList mimeFormats;
+  QModelIndexList indexes;
+};
+
 #endif // __FAVORITIESPANEWIDGET_HH__INCLUDED__