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

List:       kde-commits
Subject:    KDE/kdelibs/kio
From:       Kevin Ottens <ervin () kde ! org>
Date:       2006-11-04 12:47:49
Message-ID: 1162644469.907192.16305.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 601787 by ervin:

Make the tests compile at least (testItemForIndex() fails though).

I didn't know binary incompatible changes were allowed on friday night. 
> -)

CCMAIL:faure@kde.org



 M  +1 -0      kio/kdirmodel.h  
 M  +5 -5      tests/kdirmodeltest.cpp  


--- trunk/KDE/kdelibs/kio/kio/kdirmodel.h #601786:601787
@@ -111,6 +111,7 @@
     KDirModelPrivate *const d;
 };
 
+Q_DECLARE_METATYPE(KFileItem*)
 
 #endif /* KDIRMODEL_H */
 
--- trunk/KDE/kdelibs/kio/tests/kdirmodeltest.cpp #601786:601787
@@ -201,29 +201,29 @@
 void KDirModelTest::testItemForIndex()
 {
     // root item
-    KFileItem* rootItem = m_dirModel.itemForIndex(QModelIndex());
+    KFileItem* rootItem = m_dirModel.data(QModelIndex(), \
KDirModel::FileItemRole).value<KFileItem*>();  QVERIFY(rootItem != 0);
     QCOMPARE(rootItem->name(), QString("."));
 
-    KFileItem* fileItem = m_dirModel.itemForIndex(m_fileIndex);
+    KFileItem* fileItem = m_dirModel.data(m_fileIndex, \
KDirModel::FileItemRole).value<KFileItem*>();  QVERIFY(fileItem != 0);
     QCOMPARE(fileItem->name(), QString("toplevelfile_1"));
     QVERIFY(!fileItem->isDir());
     QCOMPARE(fileItem->url().path(), m_tempDir.name() + "toplevelfile_1");
 
-    KFileItem* dirItem = m_dirModel.itemForIndex(m_dirIndex);
+    KFileItem* dirItem = m_dirModel.data(m_dirIndex, \
KDirModel::FileItemRole).value<KFileItem*>();  QVERIFY(dirItem != 0);
     QCOMPARE(dirItem->name(), QString("subdir"));
     QVERIFY(dirItem->isDir());
     QCOMPARE(dirItem->url().path(), m_tempDir.name() + "subdir");
 
-    KFileItem* fileInDirItem = m_dirModel.itemForIndex(m_fileInDirIndex);
+    KFileItem* fileInDirItem = m_dirModel.data(m_fileInDirIndex, \
KDirModel::FileItemRole).value<KFileItem*>();  QVERIFY(fileInDirItem != 0);
     QCOMPARE(fileInDirItem->name(), QString("testfile"));
     QVERIFY(!fileInDirItem->isDir());
     QCOMPARE(fileInDirItem->url().path(), m_tempDir.name() + "subdir/testfile");
 
-    KFileItem* fileInSubdirItem = m_dirModel.itemForIndex(m_fileInSubdirIndex);
+    KFileItem* fileInSubdirItem = m_dirModel.data(m_fileInSubdirIndex, \
KDirModel::FileItemRole).value<KFileItem*>();  QVERIFY(fileInSubdirItem != 0);
     QCOMPARE(fileInSubdirItem->name(), QString("testfile"));
     QVERIFY(!fileInSubdirItem->isDir());


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