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

List:       kde-commits
Subject:    KDE/kdelibs/kdeui/tests
From:       Stephen Kelly <steveire () gmail ! com>
Date:       2010-07-29 13:02:15
Message-ID: 20100729130215.AF617AC782 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1156643 by skelly:

Remove kde dependency from the proxymodeltestsuite.

 M  +1 -0      kdescendantsproxymodeltest.cpp  
 M  +2 -0      proxymodeltestapp/matchcheckingwidget.cpp  
 M  +1 -2      proxymodeltestsuite/dynamictreemodel.cpp  
 M  +0 -1      proxymodeltestsuite/dynamictreemodel.h  
 M  +2 -2      proxymodeltestsuite/dynamictreewidget.cpp  
 M  +2 -2      proxymodeltestsuite/modelcommander.cpp  
 M  +4 -5      proxymodeltestsuite/modeleventlogger.cpp  
 M  +2 -2      proxymodeltestsuite/modelspy.cpp  
 M  +7 -7      proxymodeltestsuite/proxymodeltest.cpp  


--- trunk/KDE/kdelibs/kdeui/tests/kdescendantsproxymodeltest.cpp #1156642:1156643
@@ -23,6 +23,7 @@
 #include "proxymodeltestsuite/proxymodeltest.h"
 #include <kdescendantsproxymodel.h>
 
+#include "kdebug.h"
 
 class TestData : public ProxyModelTestData
 {
--- trunk/KDE/kdelibs/kdeui/tests/proxymodeltestapp/matchcheckingwidget.cpp \
#1156642:1156643 @@ -29,6 +29,8 @@
 #include "dynamictreewidget.h"
 #include <kselectionproxymodel.h>
 
+#include "kdebug.h"
+
 MatchCheckingWidget::MatchCheckingWidget(QWidget* parent, Qt::WindowFlags f)
   : QWidget(parent, f)
 {
--- trunk/KDE/kdelibs/kdeui/tests/proxymodeltestsuite/dynamictreemodel.cpp \
#1156642:1156643 @@ -27,7 +27,6 @@
 
 #include <QDebug>
 
-#include <kdebug.h>
 #include <QStringList>
 
 // If DUMPTREE is defined, ModelInsertCommand dumps the tree of what it is \
inserting. @@ -189,7 +188,7 @@
   {
     id = ba.toInt(&ok);
     if (!ok)
-      kDebug() << ba;
+      qDebug() << ba;
     Q_ASSERT(ok);
 
     _row = -1;
--- trunk/KDE/kdelibs/kdeui/tests/proxymodeltestsuite/dynamictreemodel.h \
#1156642:1156643 @@ -27,7 +27,6 @@
 
 #include <QDebug>
 
-#include <kdebug.h>
 #include "indexfinder.h"
 
 #include "proxymodeltestsuite_export.h"
--- trunk/KDE/kdelibs/kdeui/tests/proxymodeltestsuite/dynamictreewidget.cpp \
#1156642:1156643 @@ -329,12 +329,12 @@
   {
     const QItemSelectionRange range = selection.takeFirst(); // The selection model \
will take care of updating persistent indexes.  Q_ASSERT(range.isValid());
-    kDebug() << range.parent() << range.top() << range.bottom();
+    qDebug() << range.parent() << range.top() << range.bottom();
     removeCommand->setAncestorRowNumbers(m_dynamicTreeModel->indexToPath(range.parent()));
  removeCommand->setStartRow(range.top());
     removeCommand->setEndRow(range.bottom());
 
-    kDebug() << m_dynamicTreeModel->indexToPath(range.parent());
+    qDebug() << m_dynamicTreeModel->indexToPath(range.parent());
 
     removeCommand->doCommand();
     selection = m_treeView->selectionModel()->selection();
--- trunk/KDE/kdelibs/kdeui/tests/proxymodeltestsuite/modelcommander.cpp \
#1156642:1156643 @@ -61,7 +61,7 @@
       " - - 9"
     );
   } else {
-    kDebug() << dataTag;
+    qDebug() << dataTag;
     return testData;
   }
   execute(ins);
@@ -622,7 +622,7 @@
       " - - 10"
     );
   } else {
-    kDebug() << dataTag;
+    qDebug() << dataTag;
     delete ins;
     return testData;
   }
--- trunk/KDE/kdelibs/kdeui/tests/proxymodeltestsuite/modeleventlogger.cpp \
#1156642:1156643 @@ -25,9 +25,8 @@
 
 #include <QStringList>
 #include <QFile>
+#include <QDebug>
 
-#include <kdebug.h>
-
 #ifdef Grantlee_FOUND
 #include <grantlee_core.h>
 #include "grantlee_paths.h"
@@ -194,7 +193,7 @@
 {
 #ifdef Grantlee_FOUND
   QString logFileName = \
QString("main.%1.%2.%3.cpp").arg(m_modelName).arg(reinterpret_cast<qint64>(this)).arg(m_numLogs++);
                
-  kDebug() << "Writing to " << logFileName;
+  qDebug() << "Writing to " << logFileName;
   QFile outputFile(logFileName);
   const bool logFileOpened = outputFile.open(QFile::WriteOnly | QFile::Text);
   Q_ASSERT(logFileOpened);
@@ -220,9 +219,9 @@
   outputFile.close();
 
   if (t->error())
-    kDebug() << t->errorString();
+    qDebug() << t->errorString();
 #else
-  kDebug() << "Grantlee not found. No log written.";
+  qDebug() << "Grantlee not found. No log written.";
 #endif
 }
 
--- trunk/KDE/kdelibs/kdeui/tests/proxymodeltestsuite/modelspy.cpp #1156642:1156643
@@ -19,7 +19,7 @@
 
 #include "modelspy.h"
 
-#include <kdebug.h>
+#include <QDebug>
 
 ModelSpy::ModelSpy(QObject *parent)
   : QObject(parent), QList<QVariantList>(), m_model(0), m_isSpying(false), \
m_lazyPersist(false) @@ -270,7 +270,7 @@
     Q_ASSERT(change.startRow <= change.endRow);
 
     if (change.endRow >= m_model->rowCount(parent))
-      kDebug() << m_model << parent << change.startRow << change.endRow << \
parent.data() << m_model->rowCount(parent); +      qDebug() << m_model << parent << \
change.startRow << change.endRow << parent.data() << m_model->rowCount(parent);  
     Q_ASSERT(change.endRow < m_model->rowCount(parent));
 
--- trunk/KDE/kdelibs/kdeui/tests/proxymodeltestsuite/proxymodeltest.cpp \
#1156642:1156643 @@ -174,9 +174,9 @@
 
 // This is where is usually goes wrong...
 #if 0
-    kDebug() << qvariant_cast<QModelIndex>(result.at(0)) << parent;
-    kDebug() << result.at(1) << expected.at(1);
-    kDebug() << result.at(2) << expected.at(2);
+    qDebug() << qvariant_cast<QModelIndex>(result.at(0)) << parent;
+    qDebug() << result.at(1) << expected.at(1);
+    qDebug() << result.at(2) << expected.at(2);
 #endif
 
     QCOMPARE(qvariant_cast<QModelIndex>(result.at(0)), parent );
@@ -222,8 +222,8 @@
     QVERIFY(topLeft.isValid() && bottomRight.isValid());
 
 #if 0
-    kDebug() << qvariant_cast<QModelIndex>(result.at(0)) << topLeft;
-    kDebug() << qvariant_cast<QModelIndex>(result.at(1)) << bottomRight;
+    qDebug() << qvariant_cast<QModelIndex>(result.at(0)) << topLeft;
+    qDebug() << qvariant_cast<QModelIndex>(result.at(1)) << bottomRight;
 #endif
 
     QCOMPARE(qvariant_cast<QModelIndex>(result.at(0)), topLeft );
@@ -530,7 +530,7 @@
 
   static int numTests = 0;
   if (qApp->arguments().contains("-count"))
-    kDebug() << "numTests" << ++numTests;
+    qDebug() << "numTests" << ++numTests;
 
   m_modelSpy->preTestPersistIndexes(changeList);
 
@@ -575,7 +575,7 @@
         continue;
       }
 #if 0
-      kDebug() << idx << idx.data() << change.difference << change.toInvalid << \
persistentIndex.row(); +      qDebug() << idx << idx.data() << change.difference << \
change.toInvalid << persistentIndex.row();  #endif
 
       QCOMPARE(idx.row() + change.difference, persistentIndex.row());


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